Index: net/libzmq4/Makefile
===================================================================
--- net/libzmq4/Makefile
+++ net/libzmq4/Makefile
@@ -3,8 +3,11 @@
 PORTNAME=	libzmq4
 PORTVERSION=	4.1.5
 CATEGORIES=	net
-MASTER_SITES=	https://github.com/zeromq/zeromq4-1/releases/download/v${DISTVERSION}/
+CPPZMQ_COMMIT=  1fdf3d1dfe1491209b0d7c71e38b2f1e3f801ac9
+MASTER_SITES=	https://github.com/zeromq/zeromq4-1/releases/download/v${DISTVERSION}/ \
+		https://github.com/zeromq/cppzmq/archive/
 DISTNAME=	zeromq-${DISTVERSION}
+DISTFILES+=	zeromq-${DISTVERSION}.tar.gz ${CPPZMQ_COMMIT}.zip
 
 MAINTAINER=	koobs@FreeBSD.org
 COMMENT=	ZeroMQ core library (Version 4)
@@ -51,4 +54,11 @@
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 
+PLIST_FILES+= include/zmq.hpp include/zmq_addon.hpp
+
+post-install:
+	${INSTALL_DATA} ${WRKDIR}/cppzmq-${CPPZMQ_COMMIT}/zmq.hpp ${STAGEDIR}${PREFIX}/include
+	${INSTALL_DATA} ${WRKDIR}/cppzmq-${CPPZMQ_COMMIT}/zmq_addon.hpp ${STAGEDIR}${PREFIX}/include
+
 .include <bsd.port.mk>
+
Index: net/libzmq4/distinfo
===================================================================
--- net/libzmq4/distinfo
+++ net/libzmq4/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1470914531
+TIMESTAMP = 1490171721
 SHA256 (zeromq-4.1.5.tar.gz) = 04aac57f081ffa3a2ee5ed04887be9e205df3a7ddade0027460b8042432bdbcf
 SIZE (zeromq-4.1.5.tar.gz) = 794853
+SHA256 (1fdf3d1dfe1491209b0d7c71e38b2f1e3f801ac9.zip) = 43887f1e975e4fc41d743038d1bf81dba89e7ca8ac5b2d19d223d77fd894c7ae
+SIZE (1fdf3d1dfe1491209b0d7c71e38b2f1e3f801ac9.zip) = 12283