diff --git a/www/Makefile b/www/Makefile
index 2a5ad992bab3..2488b72c02f0 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -1503,6 +1503,7 @@
     SUBDIR += xpi-no-referrer
     SUBDIR += xpi-noscript
     SUBDIR += xpi-num2web
+    SUBDIR += xpi-passwordmaker
     SUBDIR += xpi-pdf_download
     SUBDIR += xpi-permatabs
     SUBDIR += xpi-preferential
diff --git a/www/xpi-passwordmaker/Makefile b/www/xpi-passwordmaker/Makefile
new file mode 100644
index 000000000000..5fda20edf316
--- /dev/null
+++ b/www/xpi-passwordmaker/Makefile
@@ -0,0 +1,24 @@
+# New ports collection makefile for:	xpi-passwordmaker
+# Date created:		2008-05-21
+# Whom:			Anatoly Borodin <anatoly.borodin@gmail.com>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	passwordmaker
+PORTVERSION=	1.7.2
+DISTVERSIONSUFFIX=	-fx+mz+sm
+CATEGORIES=	www
+
+MAINTAINER=	anatoly.borodin@gmail.com
+COMMENT=	Manages all your online accounts using new or existing passwords
+
+XPI_ID=		{5872365e-67d1-4afd-9480-fd293bebd20d}
+XPI_NUM=	469
+XPI_FILES=	LICENSE chrome/passwdmaker.jar chrome.manifest \
+		components/component.js defaults/preferences/passwdmaker.js \
+		install.js install.rdf
+XPI_DIRS=	chrome components defaults/preferences defaults
+
+.include "${.CURDIR}/../xpi-adblock/Makefile.xpi"
+.include <bsd.port.mk>
diff --git a/www/xpi-passwordmaker/distinfo b/www/xpi-passwordmaker/distinfo
new file mode 100644
index 000000000000..65e485277794
--- /dev/null
+++ b/www/xpi-passwordmaker/distinfo
@@ -0,0 +1,3 @@
+MD5 (xpi/passwordmaker-1.7.2-fx+mz+sm.xpi) = 0e78759a753d77fd361e0c5e6830bdb2
+SHA256 (xpi/passwordmaker-1.7.2-fx+mz+sm.xpi) = 87bec722d41be150d092e58d93ceab6e4517dbda2803544dcedf1e369a79c75c
+SIZE (xpi/passwordmaker-1.7.2-fx+mz+sm.xpi) = 254903
diff --git a/www/xpi-passwordmaker/pkg-descr b/www/xpi-passwordmaker/pkg-descr
new file mode 100644
index 000000000000..5e78cb02a3f6
--- /dev/null
+++ b/www/xpi-passwordmaker/pkg-descr
@@ -0,0 +1,15 @@
+One Password To Rule Them All!
+
+If you're like most people, you have a few passwords that you use over
+and over again on many different websites. You know this isn't secure,
+but you do it anyway. Why? Because it's difficult to remember a unique
+password for each and every web site that requires one.
+
+PasswordMaker manages all your online accounts using either new,
+uncrackable passwords it creates, or your existing passwords. It even
+automatically populates webforms for one-click login.
+
+Moreover, passwords aren't stored anywhere--they are calculated over and over
+again as they're needed--so there's nothing to be lost, hacked, or stolen!
+
+WWW: http://passwordmaker.org/