diff --git a/security/razorback-virusTotal/Makefile b/security/razorback-virusTotal/Makefile
index 208ad993a811..82924b86e24e 100644
--- a/security/razorback-virusTotal/Makefile
+++ b/security/razorback-virusTotal/Makefile
@@ -3,49 +3,38 @@
 
 PORTNAME=	virusTotal
 PORTVERSION=	0.5.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	SF/razorbacktm/Nuggets
 PKGNAMEPREFIX=	razorback-
 DIST_SUBDIR=	razorback
 
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Framework for an intelligence driven security - Virus Total Detection
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	razorback_api:${PORTSDIR}/security/razorback-api \
-		json:${PORTSDIR}/devel/json-c
+LIB_DEPENDS=	librazorback_api.so:${PORTSDIR}/security/razorback-api \
+		libjson.so:${PORTSDIR}/devel/json-c
 BUILD_DEPENDS=	razorback-masterNugget>=0.5.0:${PORTSDIR}/security/razorback-masterNugget
 RUN_DEPENDS=	razorback-masterNugget>=0.5.0:${PORTSDIR}/security/razorback-masterNugget
 
-OPTIONS_DEFINE=	DEBUG ASSERT
-ASSERT_DESC=	Enable Asserts
-
 RB_LIBDIR?=	${PREFIX}/lib/razorback
 GNU_CONFIGURE=	yes
-USES=		pkgconfig
-USE_AUTOTOOLS=	libtool
+USES=		libtool pkgconfig
 USE_LDCONFIG=	${RB_LIBDIR}
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	DEBUG ASSERT
 
-.if ${PORT_OPTIONS:MDEBUG}
-CONFIGURE_ARGS+=--enable-debug
-.endif
-
-.if ${PORT_OPTIONS:MASSERT}
-CONFIGURE_ARGS+=--enable-assert
-.endif
+ASSERT_DESC=	Enable Asserts
+ASSERT_CONFIGURE_ENABLE=	assert
+DEBUG_CONFIGURE_ENABLE=	debug
 
 post-install:
-	${LN} -sf ${RB_LIBDIR}/virusTotal.so.2 ${RB_LIBDIR}/virusTotal.so.2.0.0
-	@if [ ! -f ${PREFIX}/etc/razorback/virustotal.conf ]; then \
-		${CP} -p ${PREFIX}/etc/razorback/virustotal.conf.sample ${PREFIX}/etc/razorback/virustotal.conf ; \
-	fi
+	${LN} -sf ${RB_LIBDIR}/virusTotal.so.2 \
+		${STAGEDIR}${RB_LIBDIR}/virusTotal.so.2.0.0
 
 .include <bsd.port.mk>
diff --git a/security/razorback-virusTotal/pkg-plist b/security/razorback-virusTotal/pkg-plist
index 08e7cd05fbf2..ff4b03761f56 100644
--- a/security/razorback-virusTotal/pkg-plist
+++ b/security/razorback-virusTotal/pkg-plist
@@ -1,10 +1,6 @@
-@unexec if cmp -s %D/etc/razorback/virustotal.conf %D/etc/razorback/virustotal.conf.sample; then rm -f %D/etc/razorback/virustotal.conf; fi
-etc/razorback/virustotal.conf.sample
-@exec if [ ! -f %D/etc/razorback/virustotal.conf ] ; then cp -p %D/%F %B/virustotal.conf; fi
-@dirrmtry etc/razorback
+@sample etc/razorback/virustotal.conf.sample
 lib/razorback/virusTotal.so.2.0.0
 lib/razorback/virusTotal.so.2
 lib/razorback/virusTotal.so
-lib/razorback/virusTotal.la
 lib/razorback/virusTotal.a
 @dirrmtry lib/razorback