diff --git a/devel/cityhash/Makefile b/devel/cityhash/Makefile
index cf79387cd29c..d32ce7a2923c 100644
--- a/devel/cityhash/Makefile
+++ b/devel/cityhash/Makefile
@@ -1,22 +1,24 @@
 PORTNAME=	cityhash
 PORTVERSION=	1.1.1
 PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Family of hash functions
-WWW=		https://code.google.com/p/cityhash/
+WWW=		https://github.com/google/cityhash
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		cpe libtool
 CPE_VENDOR=	google
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	google
 GH_TAGNAME=	8af9b8c
 
+OPTIONS_DEFINE=	DOCS
+
 .include <bsd.port.mk>
diff --git a/devel/cityhash/pkg-plist b/devel/cityhash/pkg-plist
index 0bdb8ec1873c..37e6289c5b2f 100644
--- a/devel/cityhash/pkg-plist
+++ b/devel/cityhash/pkg-plist
@@ -1,8 +1,8 @@
 include/city.h
 lib/libcityhash.a
 lib/libcityhash.so
 lib/libcityhash.so.0
 lib/libcityhash.so.0.0.0
-%%DOCSDIR%%/COPYING
-%%DOCSDIR%%/NEWS
-%%DOCSDIR%%/README
+@comment %%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README