diff --git a/net-mgmt/cacti-spine/Makefile b/net-mgmt/cacti-spine/Makefile
index 406350426be0..c17fec9092d0 100644
--- a/net-mgmt/cacti-spine/Makefile
+++ b/net-mgmt/cacti-spine/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	spine
 PORTVERSION=	0.8.8b
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://www.cacti.net/downloads/${PORTNAME}/
 DISTNAME=	cacti-${PORTNAME}-${PORTVERSION}
@@ -17,21 +18,15 @@ LIB_DEPENDS=	libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS+=--with-mysql=${LOCALBASE} --with-snmp=${LOCALBASE}
 CPPFLAGS+=	`net-snmp-config --cflags`
-LDFLAGS+=	`net-snmp-config --libs`
+LIBS+=		`net-snmp-config --libs`
+USES=		libtool
 USE_MYSQL=	YES
 USE_OPENSSL=	YES
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 800040
-LDFLAGS+=	-fstack-protector
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} 's,#define\ *DEFAULT_CONF_FILE .*,#define DEFAULT_CONF_FILE "${PREFIX}/etc/spine.conf",' ${WRKSRC}/spine.h
 
-do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/spine ${STAGEDIR}${PREFIX}/bin
-	@${INSTALL_DATA} ${WRKSRC}/spine.conf.dist ${STAGEDIR}${PREFIX}/etc/spine.conf.sample
+post-install:
+	${MV} ${STAGEDIR}${PREFIX}/etc/spine.conf.dist ${STAGEDIR}${PREFIX}/etc/spine.conf.sample
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net-mgmt/cacti-spine/pkg-plist b/net-mgmt/cacti-spine/pkg-plist
index f27a2643380d..152c17fb2b6a 100644
--- a/net-mgmt/cacti-spine/pkg-plist
+++ b/net-mgmt/cacti-spine/pkg-plist
@@ -1,2 +1,2 @@
 bin/spine
-etc/spine.conf.sample
+@sample etc/spine.conf.sample