diff --git a/net-mgmt/py-aggregate6/Makefile b/net-mgmt/py-aggregate6/Makefile
index 27c44815965b..53844a248cf2 100644
--- a/net-mgmt/py-aggregate6/Makefile
+++ b/net-mgmt/py-aggregate6/Makefile
@@ -1,27 +1,28 @@
 PORTNAME=	aggregate6
 PORTVERSION=	1.0.12
+PORTREVISION=	1
 CATEGORIES=	net-mgmt python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Compress an unsorted list of IPv4 and IPv6 prefixes
 WWW=		https://github.com/job/aggregate6
 
 LICENSE=	BSD2CLAUSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}radix>=0.10.0:net/py-radix@${PY_FLAVOR}
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	\
 		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 do-test:
 	@(cd ${WRKSRC} && ${SETENV} ${PYTHON_CMD} ${PYSETUP} nosetests --with-coverage)
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/py-aggregate6/files/patch-setup.py b/net-mgmt/py-aggregate6/files/patch-setup.py
index 42a57573eabd..9d3b01234a87 100644
--- a/net-mgmt/py-aggregate6/files/patch-setup.py
+++ b/net-mgmt/py-aggregate6/files/patch-setup.py
@@ -1,12 +1,18 @@
 --- setup.py.orig	2017-12-01 09:46:38 UTC
 +++ setup.py
-@@ -70,8 +70,7 @@ setup(
+@@ -70,13 +70,12 @@ setup(
          'Programming Language :: Python :: 3',
          'Programming Language :: Python :: 3.6'
      ],
 -    setup_requires=["nose", "coverage", "mock"],
 -    install_requires=["py-radix==0.10.0"] + (
 +    install_requires=["py-radix>=0.10.0"] + (
          ["future", "ipaddress"] if sys.version_info.major == 2 else []
      ),
      packages=find_packages(exclude=['tests', 'tests.*']),
+     entry_points={'console_scripts':
+                   ['aggregate6 = aggregate6.aggregate6:main']},
+-    data_files = [('man/man7', ['aggregate6.7'])],
++    data_files = [('share/man/man7', ['aggregate6.7'])],
+     test_suite='nose.collector'
+ )