diff --git a/www/bugmenot-firefox/Makefile b/www/bugmenot-firefox/Makefile
index bdd52bb4b1f6..f587247ed9dd 100644
--- a/www/bugmenot-firefox/Makefile
+++ b/www/bugmenot-firefox/Makefile
@@ -6,15 +6,18 @@
 #
 
 PORTNAME=	bugmenot
-#PKGNAMESUFFIX set to -firefox in ../mozex/Makefile.xpi
+PORTVERSION=	1.3
+CATEGORIES=	www
+MASTER_SITES=	http://extensions.roachfiend.com/
+DISTNAME=	${PORTNAME}
+DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}_${PORTREVISION}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Firefox extension to bypass compulsory web registration
 
-MASTERDIR=	${.CURDIR}/../bugmenot
+XPI_ID=		{987311C6-B504-4aa2-90BF-60CC49808D42}
+XPI_FILES=	chrome/bugmenot.jar install.js install.rdf license.txt chrome.manifest
+XPI_DIRS=	chrome
 
-WITH_FIREFOX=	yes
-
-BROKEN=	"Does not build with new Firefox"
-
-.include "${MASTERDIR}/Makefile"
+.include "${.CURDIR}/../xpi-adblock/Makefile.xpi"
+.include <bsd.port.mk>
diff --git a/www/bugmenot-firefox/distinfo b/www/bugmenot-firefox/distinfo
new file mode 100644
index 000000000000..4b6d6cdca957
--- /dev/null
+++ b/www/bugmenot-firefox/distinfo
@@ -0,0 +1,3 @@
+MD5 (bugmenot-1.3_0/bugmenot.xpi) = f446463062b623004db61563eab815c2
+SHA256 (bugmenot-1.3_0/bugmenot.xpi) = 278cb953299e5423ed90c342c228aaa411eaa00fd6518bd73235212084703c18
+SIZE (bugmenot-1.3_0/bugmenot.xpi) = 19249
diff --git a/www/bugmenot-firefox/files/chrome.manifest b/www/bugmenot-firefox/files/chrome.manifest
new file mode 100644
index 000000000000..15a06f709c72
--- /dev/null
+++ b/www/bugmenot-firefox/files/chrome.manifest
@@ -0,0 +1,6 @@
+
+overlay	chrome://browser/content/browser.xul	chrome://bugmenot/content/bugmenotOverlay.xul
+overlay	chrome://navigator/content/navigator.xul	chrome://bugmenot/content/bugmenotOverlay.xul
+content	bugmenot	jar:chrome/bugmenot.jar!/content/bugmenot/
+
+skin	bugmenot	classic/1.0	jar:chrome/bugmenot.jar!/skin/classic/bugmenot/
diff --git a/www/bugmenot-firefox/pkg-descr b/www/bugmenot-firefox/pkg-descr
new file mode 100644
index 000000000000..643bdfb54ef4
--- /dev/null
+++ b/www/bugmenot-firefox/pkg-descr
@@ -0,0 +1,6 @@
+Bypass compulsory web registration via Firefox's right-click context menu.
+Compatibile with Mozilla and current Firefox releases.
+
+Visit bugmenot.com for full details of their service.
+
+WWW: http://roachfiend.com/archives/2005/02/07/bugmenot/