diff --git a/archivers/zopfli/Makefile b/archivers/zopfli/Makefile
index 1f8a5948cfe3..e684595a89f4 100644
--- a/archivers/zopfli/Makefile
+++ b/archivers/zopfli/Makefile
@@ -2,24 +2,39 @@
 # $FreeBSD$
 
 PORTNAME=	zopfli
-PORTVERSION=	1.0.0
+DISTVERSION=	1.0.0-31
+DISTVERSIONSUFFIX=	-g6ff3ba2
 CATEGORIES=	archivers
-MASTER_SITES=	GOOGLE_CODE
 
 MAINTAINER=	freebsd@nagilum.org
 COMMENT=	Zopfli Compression Algorithm
 
 LICENSE=	APACHE20
 
-USES=		zip
-PLIST_FILES=	bin/zopfli
+USE_GITHUB=	yes
+GH_ACCOUNT=	google
 
-do-build:
-	${CC} -O2 -W -Wall -Wextra -ansi -pedantic -lm \
-	  ${CFLAGS} ${EXTRA_DEFINES} -o ${WRKSRC}/${PORTNAME} \
-		${WRKSRC}/src/${PORTNAME}/*.c
+USES=		gmake
+
+ALL_TARGET=	${PORTNAME} ${PORTNAME}png \
+		lib${PORTNAME} lib${PORTNAME}png
+MAKE_ARGS=	CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS} ${LDFLAGS}" \
+		CXXFLAGS="${CXXFLAGS}"
+CFLAGS+=	-fPIC # XXX Convert into an implicit rule
+LDFLAGS+=	-lm
+USE_LDCONFIG=	yes
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+.for f in ${PORTNAME} ${PORTNAME}png
+	${INSTALL_PROGRAM} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/bin
+.endfor
+.for f in lib${PORTNAME}.so.1.0.1 lib${PORTNAME}png.so.1.0.0
+	${INSTALL_LIB} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/lib
+	${LN} -fs ${f} ${STAGEDIR}${PREFIX}/lib/${f:R:R}
+	${LN} -fs ${f:R:R} ${STAGEDIR}${PREFIX}/lib/${f:R:R:R}
+.endfor
+	(cd ${WRKSRC}/src && ${COPYTREE_SHARE} \
+		"zopfli zopflipng" ${STAGEDIR}${PREFIX}/include \
+		"-name *.h")
 
 .include <bsd.port.mk>
diff --git a/archivers/zopfli/distinfo b/archivers/zopfli/distinfo
index d8b8e18b48fb..11ffc89117dd 100644
--- a/archivers/zopfli/distinfo
+++ b/archivers/zopfli/distinfo
@@ -1,2 +1,2 @@
-SHA256 (zopfli-1.0.0.zip) = e20d73b56620285e6cce5b510d8e5da6835a81940e48cdf35a69090e666f3adb
-SIZE (zopfli-1.0.0.zip) = 57873
+SHA256 (google-zopfli-1.0.0-31-g6ff3ba2_GH0.tar.gz) = bafc6d90a4ce57c768fe2810d83d8f72292fed8ec3a9c605e4f90077f4dab95b
+SIZE (google-zopfli-1.0.0-31-g6ff3ba2_GH0.tar.gz) = 127974
diff --git a/archivers/zopfli/pkg-plist b/archivers/zopfli/pkg-plist
new file mode 100644
index 000000000000..29c191deb8cc
--- /dev/null
+++ b/archivers/zopfli/pkg-plist
@@ -0,0 +1,23 @@
+bin/zopfli
+bin/zopflipng
+include/zopfli/blocksplitter.h
+include/zopfli/cache.h
+include/zopfli/deflate.h
+include/zopfli/gzip_container.h
+include/zopfli/hash.h
+include/zopfli/katajainen.h
+include/zopfli/lz77.h
+include/zopfli/squeeze.h
+include/zopfli/tree.h
+include/zopfli/util.h
+include/zopfli/zlib_container.h
+include/zopfli/zopfli.h
+include/zopflipng/lodepng/lodepng.h
+include/zopflipng/lodepng/lodepng_util.h
+include/zopflipng/zopflipng_lib.h
+lib/libzopfli.so
+lib/libzopfli.so.1
+lib/libzopfli.so.1.0.1
+lib/libzopflipng.so
+lib/libzopflipng.so.1
+lib/libzopflipng.so.1.0.0