diff --git a/devel/zmq/Makefile b/devel/zmq/Makefile
index ce9ecf41de2f..6c23517d168d 100644
--- a/devel/zmq/Makefile
+++ b/devel/zmq/Makefile
@@ -6,14 +6,49 @@
 #
 
 PORTNAME=	zmq
-PORTVERSION=	0.2
+PORTVERSION=	2.0.7
 CATEGORIES=	devel net
-MASTER_SITES=	http://www.zeromq.org/local--files/area:download/
+MASTER_SITES=	http://zeromq.wdfiles.com/local--files/area:download/
+DISTNAME=	zeromq-${DISTVERSION}
 
 MAINTAINER=	gslin@gslin.org
 COMMENT=	Open source message queue optimised for performance
 
 GNU_CONFIGURE=	yes
+USE_GNOME=	gnomehack
 USE_LDCONFIG=	yes
 
+MAN1=		zmq_forwarder.1	\
+		zmq_queue.1	\
+		zmq_streamer.1
+MAN3=		zmq_bind.3 \
+		zmq_close.3 \
+		zmq_connect.3 \
+		zmq_errno.3 \
+		zmq_getsockopt.3 \
+		zmq_init.3 \
+		zmq_msg_close.3 \
+		zmq_msg_copy.3 \
+		zmq_msg_data.3 \
+		zmq_msg_init.3 \
+		zmq_msg_init_data.3 \
+		zmq_msg_init_size.3 \
+		zmq_msg_move.3 \
+		zmq_msg_size.3 \
+		zmq_poll.3 \
+		zmq_recv.3 \
+		zmq_send.3 \
+		zmq_setsockopt.3 \
+		zmq_socket.3 \
+		zmq_strerror.3 \
+		zmq_term.3 \
+		zmq_version.3
+MAN7=		zmq.7 \
+		zmq_tcp.7 \
+		zmq_pgm.7 \
+		zmq_epgm.7 \
+		zmq_inproc.7 \
+		zmq_ipc.7 \
+		zmq_cpp.7
+
 .include <bsd.port.mk>
diff --git a/devel/zmq/distinfo b/devel/zmq/distinfo
index b67206b65f57..474006c6bba9 100644
--- a/devel/zmq/distinfo
+++ b/devel/zmq/distinfo
@@ -1,3 +1,3 @@
-MD5 (zmq-0.2.tar.gz) = e3f9876311b843de96176f8e392a1d19
-SHA256 (zmq-0.2.tar.gz) = d32f36b5e196a965999372e5cf51a53b84ff49e4e487aa82179594e6d0eb93c5
-SIZE (zmq-0.2.tar.gz) = 384601
+MD5 (zeromq-2.0.7.tar.gz) = c9cb3ee4499df1781f8ddc03c20d656b
+SHA256 (zeromq-2.0.7.tar.gz) = 34a1b74b68556b83c39c88104f3c3c415866f586e1512a95c6a2918a8156e140
+SIZE (zeromq-2.0.7.tar.gz) = 1016700
diff --git a/devel/zmq/pkg-plist b/devel/zmq/pkg-plist
index 267b74d02292..156a6b0d0065 100644
--- a/devel/zmq/pkg-plist
+++ b/devel/zmq/pkg-plist
@@ -1,40 +1,11 @@
 @comment $FreeBSD$
-include/zmq/amqp09_client_fsm.hpp
-include/zmq/amqp09_decoder.hpp
-include/zmq/amqp09_encoder.hpp
-include/zmq/amqp09_engine.hpp
-include/zmq/amqp09_marshaller.hpp
-include/zmq/amqp09_server_fsm.hpp
-include/zmq/amqp09_unmarshaller.hpp
-include/zmq/api_engine.hpp
-include/zmq/atomic_ptr.hpp
-include/zmq/atomic_uint32.hpp
-include/zmq/bp_decoder.hpp
-include/zmq/bp_encoder.hpp
-include/zmq/bp_engine.hpp
-include/zmq/cmsg.hpp
-include/zmq/decoder.hpp
-include/zmq/dispatcher.hpp
-include/zmq/dispatcher_proxy.hpp
-include/zmq/encoder.hpp
-include/zmq/err.hpp
-include/zmq/free_fn.hpp
-include/zmq/i_amqp09.hpp
-include/zmq/i_pollable.hpp
-include/zmq/i_signaler.hpp
-include/zmq/platform.hpp
-include/zmq/poll_thread.hpp
-include/zmq/stdint.hpp
-include/zmq/tcp_socket.hpp
-include/zmq/wire.hpp
-include/zmq/ydispatcher.hpp
-include/zmq/ydispatcher_proxy.hpp
-include/zmq/ypipe.hpp
-include/zmq/ypollset.hpp
-include/zmq/ysemaphore.hpp
-include/zmq/ysocketpair.hpp
+bin/zmq_forwarder
+bin/zmq_queue
+bin/zmq_streamer
+include/zmq.h
+include/zmq.hpp
 lib/libzmq.a
 lib/libzmq.la
 lib/libzmq.so
 lib/libzmq.so.0
-@dirrmtry include/zmq
+libdata/pkgconfig/libzmq.pc