diff --git a/include/zmq.h b/include/zmq.h
index 48c0c8d0..23c6bee0 100644
--- a/include/zmq.h
+++ b/include/zmq.h
@@ -1,6 +1,6 @@
 /*
-    Copyright (c) 2009-2011 250bpm s.r.o.
     Copyright (c) 2007-2010 iMatix Corporation
+    Copyright (c) 2009-2011 250bpm s.r.o.
     Copyright (c) 2011 VMware, Inc.
     Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file
 
@@ -187,15 +187,16 @@ ZMQ_EXPORT int zmq_term (zmq_ctx_t context);
 #define ZMQ_SUB 2
 #define ZMQ_REQ 3
 #define ZMQ_REP 4
-#define ZMQ_XREQ 5
-#define ZMQ_XREP 6
+#define ZMQ_DEALER 5
+#define ZMQ_ROUTER 6
 #define ZMQ_PULL 7
 #define ZMQ_PUSH 8
 #define ZMQ_XPUB 9
 #define ZMQ_XSUB 10
 
-#define ZMQ_ROUTER ZMQ_XREP
-#define ZMQ_DEALER ZMQ_XREQ
+/*  Deprecated aliases                                                        */
+#define ZMQ_XREQ ZMQ_DEALER
+#define ZMQ_XREP ZMQ_ROUTER
 
 /*  Socket options.                                                           */
 #define ZMQ_AFFINITY 4