diff --git a/security/metasploit-devel/Makefile b/security/metasploit-devel/Makefile
index dce9a37a121f..bf74e8c3a673 100644
--- a/security/metasploit-devel/Makefile
+++ b/security/metasploit-devel/Makefile
@@ -22,11 +22,6 @@ RUN_DEPENDS=	${LOCALBASE}/bin/svn:${PORTSDIR}/devel/subversion \
 SCRIPTS=	msfcli msfconsole msfd msfencode msflicense msfopcode \
 		msfpayload msfpescan msfweb
 
-.if defined(WITH_MSFWX)
-RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/wxruby.so:${PORTSDIR}/x11-toolkits/ruby-wx
-SCRIPTS+=	msfwx
-.endif
-
 WRKSRC=	${WRKDIR}/framework-${DISTVERSION}
 RESTRICTED=	May not be re-sold for more than the cost of duplication, nor redistributed after patching
 
@@ -36,6 +31,14 @@ USE_RUBY=	yes
 
 .include <bsd.port.pre.mk>
 
+.if defined(WITH_MSFWX)
+RUN_DEPENDS+=	${RUBY_SITEARCHLIBDIR}/wxruby.so:${PORTSDIR}/x11-toolkits/ruby-wx
+SCRIPTS+=	msfwx
+PLIST_SUB+=	MSF=""
+.else
+PLIST_SUB+=	MSF="@comment "
+.endif
+
 .if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) && !defined(PACKAGE_BUILDING)
 ECHO_MSG=/usr/bin/printf
 IGNORE=\n \
diff --git a/security/metasploit-devel/pkg-plist b/security/metasploit-devel/pkg-plist
index 567cd20fe3ac..6de30542ce93 100644
--- a/security/metasploit-devel/pkg-plist
+++ b/security/metasploit-devel/pkg-plist
@@ -7,6 +7,7 @@ bin/msfopcode
 bin/msfpayload
 bin/msfpescan
 bin/msfweb
+%%MSF%%bin/msfwx
 %%DATADIR%%/BUGS.txt
 %%DATADIR%%/README
 %%DATADIR%%/data/meterpreter/ext_server_priv.dll