diff --git a/sysutils/graffer/Makefile b/sysutils/graffer/Makefile
index 73478f3690e9..8dc6b091b214 100644
--- a/sysutils/graffer/Makefile
+++ b/sysutils/graffer/Makefile
@@ -1,33 +1,28 @@
 PORTNAME=	graffer
-PORTVERSION=	1.1
-PORTREVISION=	3
+DISTVERSION=	1.5.1
 CATEGORIES=	sysutils
-MASTER_SITES=	http://chaosophia.net/downloads/graffer/ \
-		http://ns1.chaosophia.net/downloads/graffer/
+MASTER_SITES=	http://chaosophia.net/downloads/graffer/
 
 MAINTAINER=	koue@chaosophia.net
-COMMENT=	Utility to render graphical statistics
+COMMENT=	Utility to collect and render graphical statistics
 WWW=		http://chaosophia.net/graffer/
 
-LIB_DEPENDS=	libpng.so:graphics/png \
-		libfreetype.so:print/freetype2
+LICENSE=	BSD2CLAUSE
 
-USES=		jpeg
-
-PLIST_FILES=	bin/graffer \
-		etc/graffer/graffer.conf.example \
-		share/man/man8/graffer.8.gz
+LIB_DEPENDS=	libpng.so:graphics/png
 
 post-patch:
-	@${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|" \
-		${WRKSRC}/graffer.[c8]
-	@${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|" \
-		${WRKSRC}/graffer.conf.example
+	@${REINPLACE_CMD} -e "s|/etc/graffer/|${ETCDIR}/|; \
+			s|/etc/graffer.conf|${ETCDIR}/graffer.conf|" \
+		${WRKSRC}/src/graffer.[c8] ${WRKSRC}/etc/graffer.conf.example
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/graffer ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/graffer.8 ${STAGEDIR}${PREFIX}/share/man/man8
-	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/graffer
-	${INSTALL_DATA} ${WRKSRC}/graffer.conf.example ${STAGEDIR}${PREFIX}/etc/graffer
+	${INSTALL_PROGRAM} ${WRKSRC}/src/graffer ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/src/graffer.8 ${STAGEDIR}${PREFIX}/share/man/man8
+	(cd ${WRKSRC}/etc/conf.d && ${COPYTREE_SHARE} . ${STAGEDIR}${ETCDIR}/conf.d.sample)
+	(cd ${WRKSRC}/scripts && ${COPYTREE_BIN} . ${STAGEDIR}${ETCDIR}/scripts.sample \
+		' ! -name README ')
+	${INSTALL_DATA} ${WRKSRC}/scripts/README ${STAGEDIR}${ETCDIR}/scripts.sample
+	${INSTALL_DATA} ${WRKSRC}/etc/graffer.conf.example ${STAGEDIR}${ETCDIR}/graffer.conf.sample
 
 .include <bsd.port.mk>
diff --git a/sysutils/graffer/distinfo b/sysutils/graffer/distinfo
index 4b75a4a7a766..6636c13d4919 100644
--- a/sysutils/graffer/distinfo
+++ b/sysutils/graffer/distinfo
@@ -1,2 +1,3 @@
-SHA256 (graffer-1.1.tar.gz) = 1c823653dbd86b3c42c0505895dc6ce24a4ceeb2e5c4757a8a7c2550aa464ac1
-SIZE (graffer-1.1.tar.gz) = 94394
+TIMESTAMP = 1761616161
+SHA256 (graffer-1.5.1.tar.gz) = 7acd211dbe4bc3288a5347716fc694c9b72c0d82fb7e75ba834b8c62154be913
+SIZE (graffer-1.5.1.tar.gz) = 36501
diff --git a/sysutils/graffer/pkg-plist b/sysutils/graffer/pkg-plist
new file mode 100644
index 000000000000..bb99ea039559
--- /dev/null
+++ b/sysutils/graffer/pkg-plist
@@ -0,0 +1,15 @@
+bin/graffer
+%%ETCDIR%%/conf.d.sample/10-cpu-mem.conf
+%%ETCDIR%%/conf.d.sample/20-disk-proc.conf
+%%ETCDIR%%/conf.d.sample/30-states.conf
+%%ETCDIR%%/conf.d.sample/40-source-conn.conf
+%%ETCDIR%%/conf.d.sample/50-tcp-udp.conf
+%%ETCDIR%%/conf.d.sample/60-net.conf
+@sample %%ETCDIR%%/graffer.conf.sample
+%%ETCDIR%%/scripts.sample/README
+%%ETCDIR%%/scripts.sample/freebsd/cpu.sh
+%%ETCDIR%%/scripts.sample/freebsd/disk.sh
+%%ETCDIR%%/scripts.sample/freebsd/netstat.sh
+%%ETCDIR%%/scripts.sample/freebsd/swap.sh
+%%ETCDIR%%/scripts.sample/setup.sh
+share/man/man8/graffer.8.gz