diff --git a/archivers/snappy/Makefile b/archivers/snappy/Makefile
index 010babcbf1f4..074e745ee6dd 100644
--- a/archivers/snappy/Makefile
+++ b/archivers/snappy/Makefile
@@ -1,29 +1,33 @@
 PORTNAME=	snappy
-PORTVERSION=	1.2.0
-PORTREVISION=	0
+DISTVERSION=	1.2.0
 CATEGORIES=	archivers
 
 MAINTAINER=	vanilla@FreeBSD.org
 COMMENT=	Fast compressor/decompressor library
 WWW=		https://google.github.io/snappy/
 
 LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		cmake compiler:c++11-lang cpe
-USE_LDCONFIG=	yes
-CMAKE_ON=	BUILD_SHARED_LIBS
-CMAKE_OFF=	SNAPPY_BUILD_TESTS SNAPPY_BUILD_BENCHMARKS
-CMAKE_BUILD_TYPE=	Release
 CPE_VENDOR=	google
+USE_LDCONFIG=	yes
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	google
-PLIST_SUB+=	PORTVERSION=${PORTVERSION}
-SUB_FILES+=	snappy.pc
-SUB_LIST+=	PORTVERSION=${PORTVERSION}
+
 PIE_UNSAFE=	yes
 
+PLIST_SUB=	DISTVERSION=${DISTVERSION}
+SUB_FILES=	snappy.pc
+SUB_LIST=	DISTVERSION=${DISTVERSION}
+
+CMAKE_OFF=	SNAPPY_BUILD_BENCHMARKS \
+		SNAPPY_BUILD_TESTS
+CMAKE_ON=	BUILD_SHARED_LIBS
+
 post-install:
-	@${STRIP_CMD} ${STAGEDIR}${LOCALBASE}/lib/libsnappy.so.${PORTVERSION}
+	@${STRIP_CMD} ${STAGEDIR}${LOCALBASE}/lib/libsnappy.so.${DISTVERSION}
 	${INSTALL_DATA} ${WRKDIR}/snappy.pc ${STAGEDIR}${LOCALBASE}/libdata/pkgconfig
 
 .include <bsd.port.mk>
diff --git a/archivers/snappy/files/snappy.pc.in b/archivers/snappy/files/snappy.pc.in
index 8957d6fc2869..1839981c155d 100644
--- a/archivers/snappy/files/snappy.pc.in
+++ b/archivers/snappy/files/snappy.pc.in
@@ -1,10 +1,10 @@
 prefix=%%PREFIX%%
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include
 
 Name: snappy
 Description: A fast compression/decompression library
-Version: %%PORTVERSION%%
+Version: %%DISTVERSION%%
 Libs: -L${libdir} -lsnappy
 Cflags: -I${includedir}
diff --git a/archivers/snappy/pkg-plist b/archivers/snappy/pkg-plist
index 8eca7d24cf00..2d1cdf9f8f90 100644
--- a/archivers/snappy/pkg-plist
+++ b/archivers/snappy/pkg-plist
@@ -1,13 +1,13 @@
 include/snappy-c.h
 include/snappy-sinksource.h
 include/snappy-stubs-public.h
 include/snappy.h
 lib/cmake/Snappy/SnappyConfig.cmake
 lib/cmake/Snappy/SnappyConfigVersion.cmake
 lib/cmake/Snappy/SnappyTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/Snappy/SnappyTargets.cmake
 lib/libsnappy.a
 lib/libsnappy.so
 lib/libsnappy.so.1
-lib/libsnappy.so.%%PORTVERSION%%
+lib/libsnappy.so.%%DISTVERSION%%
 libdata/pkgconfig/snappy.pc