diff --git a/security/metasploit/Makefile b/security/metasploit/Makefile
index f7b8fb44310e..a4966ff4346c 100644
--- a/security/metasploit/Makefile
+++ b/security/metasploit/Makefile
@@ -2,7 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	metasploit
-DISTVERSION=	4.9.3
+PORTVERSION=	4.9.3
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://downloads.metasploit.com/data/releases/archive/
 DISTNAME=	framework-${DISTVERSION}
@@ -20,7 +21,9 @@ RUN_DEPENDS=	nasm:${PORTSDIR}/devel/nasm \
 		rubygem-network_interface>=0.0.1:${PORTSDIR}/net/rubygem-network_interface \
 		rubygem-packetfu>=1.1.8:${PORTSDIR}/net/rubygem-packetfu \
 		rubygem-pcaprub>=0:${PORTSDIR}/net/rubygem-pcaprub \
-		rubygem-robots>=0:${PORTSDIR}/www/rubygem-robots
+		rubygem-rkelly-remix>=0:${PORTSDIR}/www/rubygem-rkelly-remix \
+		rubygem-robots>=0:${PORTSDIR}/www/rubygem-robots \
+		rubygem-sqlite3>=0:${PORTSDIR}/databases/rubygem-sqlite3
 
 WRKSRC=		${WRKDIR}/msf3
 SCRIPTS=	msfbinscan msfcli msfconsole msfd msfelfscan msfencode \
diff --git a/www/Makefile b/www/Makefile
index 0faf6bd07cce..4537b1f5e31b 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -1865,6 +1865,7 @@
     SUBDIR += rubygem-rest-client
     SUBDIR += rubygem-rfacebook
     SUBDIR += rubygem-rfeedfinder
+    SUBDIR += rubygem-rkelly-remix
     SUBDIR += rubygem-rqrcode
     SUBDIR += rubygem-robotex
     SUBDIR += rubygem-robots
diff --git a/www/rubygem-rkelly-remix/Makefile b/www/rubygem-rkelly-remix/Makefile
new file mode 100644
index 000000000000..d86ba51cf4d2
--- /dev/null
+++ b/www/rubygem-rkelly-remix/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+PORTNAME=	rkelly-remix
+PORTVERSION=	0.0.6
+CATEGORIES=	www rubygems
+MASTER_SITES=	RG
+
+MAINTAINER=	ruby@FreeBSD.org
+COMMENT=	Pure ruby javascript parser and interpreter
+
+LICENSE=	MIT
+
+USE_RUBY=	yes
+USE_RUBYGEMS=	yes
+RUBYGEM_AUTOPLIST=yes
+
+.include <bsd.port.mk>
diff --git a/www/rubygem-rkelly-remix/distinfo b/www/rubygem-rkelly-remix/distinfo
new file mode 100644
index 000000000000..343446925203
--- /dev/null
+++ b/www/rubygem-rkelly-remix/distinfo
@@ -0,0 +1,2 @@
+SHA256 (rubygem/rkelly-remix-0.0.6.gem) = 3fdcaee584b2d1050cf207b4fbddad5637d3502d1ceb23f733a95bb48bb61ac6
+SIZE (rubygem/rkelly-remix-0.0.6.gem) = 69120
diff --git a/www/rubygem-rkelly-remix/pkg-descr b/www/rubygem-rkelly-remix/pkg-descr
new file mode 100644
index 000000000000..65d7f1b802ac
--- /dev/null
+++ b/www/rubygem-rkelly-remix/pkg-descr
@@ -0,0 +1,4 @@
+RKelly Remix is a pure ruby javascript parser and interpreter.  It is a fork of
+the RKelly JavaScript parser.
+
+WWW: https://github.com/nene/rkelly-remix