diff --git a/www/Makefile b/www/Makefile
index 161439bf6deb..879bc2273fa4 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -966,6 +966,7 @@
     SUBDIR += xpath2rss
     SUBDIR += xpi-adblock
     SUBDIR += xpi-colorfultabs
+    SUBDIR += xpi-fasterfox
     SUBDIR += xshttpd
     SUBDIR += xshttpd-devel
     SUBDIR += xulrunner
diff --git a/www/xpi-fasterfox/Makefile b/www/xpi-fasterfox/Makefile
new file mode 100644
index 000000000000..23da28d74e74
--- /dev/null
+++ b/www/xpi-fasterfox/Makefile
@@ -0,0 +1,22 @@
+# New ports collection makefile for:	xpi-fasterfox
+# Date created:		28 March 2006
+# Whom:			Andrew Pantyukhin <infofarmer@gmail.com>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	fasterfox
+PORTVERSION=	1.0.3
+DISTVERSIONSUFFIX=	-fx
+CATEGORIES=	www
+
+MAINTAINER=	infofarmer@gmail.com
+COMMENT=	Performance and network tweaks for Firefox
+
+XPI_ID=		{c36177c0-224a-11da-8cd6-0800200c9a66}
+XPI_FILES=	chrome/fasterfox.jar defaults/preferences/fasterfox.js install.rdf \
+		readme.txt chrome.manifest
+XPI_DIRS=	chrome defaults/preferences defaults
+
+.include "../xpi-adblock/Makefile.xpi"
+.include <bsd.port.mk>
diff --git a/www/xpi-fasterfox/distinfo b/www/xpi-fasterfox/distinfo
new file mode 100644
index 000000000000..c373555605c3
--- /dev/null
+++ b/www/xpi-fasterfox/distinfo
@@ -0,0 +1,3 @@
+MD5 (xpi/fasterfox-1.0.3-fx.xpi) = 6b34852c2c086b0444b79000c7ff25cb
+SHA256 (xpi/fasterfox-1.0.3-fx.xpi) = b617ab9dd02aae3f5c0208afecf2481a44a14aeb7612345699092512238c9810
+SIZE (xpi/fasterfox-1.0.3-fx.xpi) = 93653
diff --git a/www/xpi-fasterfox/files/chrome.manifest b/www/xpi-fasterfox/files/chrome.manifest
new file mode 100644
index 000000000000..d6ba33823ecb
--- /dev/null
+++ b/www/xpi-fasterfox/files/chrome.manifest
@@ -0,0 +1,36 @@
+
+overlay	chrome://browser/content/browser.xul	chrome://fasterfox/content/fasterfoxOverlay.xul
+overlay	chrome://navigator/content/navigator.xul	chrome://fasterfox/content/fasterfoxOverlay.xul
+content	fasterfox	jar:chrome/fasterfox.jar!/content/fasterfox/
+
+skin	fasterfox	classic/1.0	jar:chrome/fasterfox.jar!/skin/classic/fasterfox/
+
+locale	fasterfox	en-US	jar:chrome/fasterfox.jar!/locale/en-US/fasterfox/
+
+locale	fasterfox	cs-CZ	jar:chrome/fasterfox.jar!/locale/cs-CZ/fasterfox/
+
+locale	fasterfox	de-DE	jar:chrome/fasterfox.jar!/locale/de-DE/fasterfox/
+
+locale	fasterfox	fi-FI	jar:chrome/fasterfox.jar!/locale/fi-FI/fasterfox/
+
+locale	fasterfox	fr-FR	jar:chrome/fasterfox.jar!/locale/fr-FR/fasterfox/
+
+locale	fasterfox	he-IL	jar:chrome/fasterfox.jar!/locale/he-IL/fasterfox/
+
+locale	fasterfox	it-IT	jar:chrome/fasterfox.jar!/locale/it-IT/fasterfox/
+
+locale	fasterfox	ja-JP	jar:chrome/fasterfox.jar!/locale/ja-JP/fasterfox/
+
+locale	fasterfox	ko-KR	jar:chrome/fasterfox.jar!/locale/ko-KR/fasterfox/
+
+locale	fasterfox	nl-NL	jar:chrome/fasterfox.jar!/locale/nl-NL/fasterfox/
+
+locale	fasterfox	pl-PL	jar:chrome/fasterfox.jar!/locale/pl-PL/fasterfox/
+
+locale	fasterfox	sl-SI	jar:chrome/fasterfox.jar!/locale/sl-SI/fasterfox/
+
+locale	fasterfox	sk-SK	jar:chrome/fasterfox.jar!/locale/sk-SK/fasterfox/
+
+locale	fasterfox	tr-TR	jar:chrome/fasterfox.jar!/locale/tr-TR/fasterfox/
+
+locale	fasterfox	zh-CN	jar:chrome/fasterfox.jar!/locale/zh-CN/fasterfox/
diff --git a/www/xpi-fasterfox/pkg-descr b/www/xpi-fasterfox/pkg-descr
new file mode 100644
index 000000000000..19ea5d240f1f
--- /dev/null
+++ b/www/xpi-fasterfox/pkg-descr
@@ -0,0 +1,10 @@
+Fasterfox allows you to tweak many network and rendering
+settings such as simultaneous connections, pipelining,
+cache, DNS cache, and initial paint delay.
+
+Dynamic speed increases can be obtained with the unique
+prefetching mechanism, which recycles idle bandwidth by
+silently loading and caching all of the links on the page
+you are browsing.
+
+WWW: http://fasterfox.mozdev.org/