Index: sysutils/Makefile
===================================================================
--- sysutils/Makefile
+++ sysutils/Makefile
@@ -1255,6 +1255,7 @@
     SUBDIR += zetaback
     SUBDIR += zfs-periodic
     SUBDIR += zfs-replicate
+    SUBDIR += zfs-snap-diff
     SUBDIR += zfs-snapshot-clean
     SUBDIR += zfs-snapshot-mgmt
     SUBDIR += zfs-stats
Index: sysutils/zfs-snap-diff/Makefile
===================================================================
--- /dev/null
+++ sysutils/zfs-snap-diff/Makefile
@@ -0,0 +1,50 @@
+# $FreeBSD$
+
+PORTNAME=	zfs-snap-diff
+PORTVERSION=	0.0.9
+CATEGORIES=	sysutils
+DIST_SUBDIR=	${PORTNAME}
+
+MAINTAINER=	ben.lavery@hashbang0.com
+COMMENT=	View ZFS snapshot differences via a web browser
+
+LICENSE=	APACHE20 MIT
+LICENSE_COMB=	multi
+LICENSE_FILE_APACHE20=	${WRKSRC}/src/github.com/sergi/go-diff/LICENSE.txt
+LICENSE_FILE_MIT=	${WRKSRC}/src/github.com/j-keck/${PORTNAME}/LICENSE
+
+BUILD_DEPENDS=	go>=1.5.0:lang/go
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	j-keck:DEFAULT \
+		sergi:go_diff
+GH_PROJECT=	go-diff:go_diff
+GH_TAGNAME=	ec7fdbb:go_diff
+
+PLIST_FILES=	bin/zfs-snap-diff
+
+STRIP=		# stripping can break go binaries
+
+post-extract:
+	@${MKDIR} ${WRKSRC}/src/github.com/sergi
+	@${MKDIR} ${WRKSRC}/src/github.com/j-keck/zfs-snap-diff
+.for src in Godeps LICENSE bindata.go build.pl diff.go diff_result.go \
+diff_test.go dir_entry.go file_handle.go main.go params.go params_test.go \
+test.go utils.go utils_test.go vendor web.go zfs.go zfs_dataset.go \
+zfs_dataset_diff.go zfs_dataset_snapshots.go zfs_dataset_snapshots_test.go \
+zfs_dataset_test.go zfs_test.go
+	@${MV} ${WRKSRC}/${src} \
+		${WRKSRC}/src/github.com/j-keck/${PORTNAME}
+.endfor
+	@${MV} ${WRKSRC_go_diff} ${WRKSRC}/src/github.com/sergi/go-diff
+
+do-build:
+	@cd ${WRKSRC}/src/github.com/j-keck/${PORTNAME} && \
+	${SETENV} GOPATH=${WRKSRC} go build -o bin/${PORTNAME}
+
+do-install:
+	${INSTALL_PROGRAM} \
+	${WRKSRC}/src/github.com/j-keck/${PORTNAME}/bin/${PORTNAME} \
+	${STAGEDIR}/${PREFIX}/bin/${PORTNAME}
+
+.include <bsd.port.mk>
Index: sysutils/zfs-snap-diff/distinfo
===================================================================
--- /dev/null
+++ sysutils/zfs-snap-diff/distinfo
@@ -0,0 +1,5 @@
+TIMESTAMP = 1474277611
+SHA256 (zfs-snap-diff/j-keck-zfs-snap-diff-0.0.9_GH0.tar.gz) = 4c836f1bb8e18e3ff891e83cd65bde4ab956e5621cf861fb127b865efbf0267f
+SIZE (zfs-snap-diff/j-keck-zfs-snap-diff-0.0.9_GH0.tar.gz) = 1407591
+SHA256 (zfs-snap-diff/sergi-go-diff-ec7fdbb_GH0.tar.gz) = 990e21d04515c2fe118fc7e0587690eb4ba8054ed6ac6aa3747fe82c717177c1
+SIZE (zfs-snap-diff/sergi-go-diff-ec7fdbb_GH0.tar.gz) = 38232
Index: sysutils/zfs-snap-diff/pkg-descr
===================================================================
--- /dev/null
+++ sysutils/zfs-snap-diff/pkg-descr
@@ -0,0 +1,8 @@
+With zfs-snap-diff you can explore file differences and restore changes from 
+older file versions in different zfs snapshots. You can restore the whole file 
+from an older version, or select single changes to revert in the 'diff' view.
+
+zfs-snap-diff has a web frontend, so it can run on your local work machine or 
+on your remote file / backup server (no Xserver necessary).
+
+WWW: https://github.com/j-keck/zfs-snap-diff