diff --git a/zmq.hpp b/zmq.hpp
index e3bfded..4271caf 100644
--- a/zmq.hpp
+++ b/zmq.hpp
@@ -30,6 +30,7 @@
 #include <algorithm>
 #include <cassert>
 #include <cstring>
+#include <string>
 #include <exception>
 
 //  Detect whether the compiler supports C++11 rvalue references.
@@ -55,6 +56,10 @@
     #define ZMQ_DELETED_FUNCTION
 #endif
 
+#if ZMQ_VERSION >= ZMQ_MAKE_VERSION(3, 3, 0)
+#define ZMQ_NEW_MONITOR_EVENT_LAYOUT
+#endif
+
 // In order to prevent unused variable warnings when building in non-debug
 // mode use this macro to make assertions.
 #ifndef NDEBUG
@@ -444,66 +449,79 @@ namespace zmq
 			rc = zmq_connect (s, addr_);
 			assert (rc == 0);
 			while (true) {
-				zmq_msg_t msg;
-				zmq_msg_init (&msg);
-				rc = zmq_recvmsg (s, &msg, 0);
+				zmq_msg_t eventMsg;
+				zmq_msg_init (&eventMsg);
+				rc = zmq_recvmsg (s, &eventMsg, 0);
 				if (rc == -1 && zmq_errno() == ETERM)
 					break;
 				assert (rc != -1);
+				zmq_event_t* event = static_cast<zmq_event_t*>(zmq_msg_data (&eventMsg));
 				
-				zmq_event_t* event = static_cast<zmq_event_t*>(zmq_msg_data (&msg));
-
+#ifdef ZMQ_NEW_MONITOR_EVENT_LAYOUT
+				zmq_msg_t addrMsg;
+				zmq_msg_init (&addrMsg);
+				rc = zmq_recvmsg (s, &addrMsg, 0);
+				if (rc == -1 && zmq_errno() == ETERM)
+					break;
+				assert (rc != -1);
+				const char* str = static_cast<const char*>(zmq_msg_data (&addrMsg));
+				std::string address(str, str + zmq_msg_size(&addrMsg));
+				zmq_msg_close (&addrMsg);
+#else
+				// Bit of a hack, but all events in the zmq_event_t union have the same layout so this will work for all event types.
+				std::string address = event->data.connected.addr;
+#endif
 				switch (event->event) {
 				case ZMQ_EVENT_CONNECTED:
-					on_event_connected(*event);
+					on_event_connected(*event, address.c_str());
 					break;
 				case ZMQ_EVENT_CONNECT_DELAYED:
-					on_event_connect_delayed(*event);
+					on_event_connect_delayed(*event, address.c_str());
 					break;
 				case ZMQ_EVENT_CONNECT_RETRIED:
-					on_event_connect_retried(*event);
+					on_event_connect_retried(*event, address.c_str());
 					break;
 				case ZMQ_EVENT_LISTENING:
-					on_event_listening(*event);
+					on_event_listening(*event, address.c_str());
 					break;
 				case ZMQ_EVENT_BIND_FAILED:
-					on_event_bind_failed(*event);
+					on_event_bind_failed(*event, address.c_str());
 					break;
 				case ZMQ_EVENT_ACCEPTED:
-					on_event_accepted(*event);
+					on_event_accepted(*event, address.c_str());
 					break;
 				case ZMQ_EVENT_ACCEPT_FAILED:
-					on_event_accept_failed(*event);
+					on_event_accept_failed(*event, address.c_str());
 					break;
 				case ZMQ_EVENT_CLOSED:
-					on_event_closed(*event);
+					on_event_closed(*event, address.c_str());
 					break;
 				case ZMQ_EVENT_CLOSE_FAILED:
-					on_event_close_failed(*event);
+					on_event_close_failed(*event, address.c_str());
 					break;
 				case ZMQ_EVENT_DISCONNECTED:
-					on_event_disconnected(*event);
+					on_event_disconnected(*event, address.c_str());
 					break;
 				default:
-					on_event_unknown(*event);
+					on_event_unknown(*event, address.c_str());
 					break;
 				}
-				zmq_msg_close (&msg);
+				zmq_msg_close (&eventMsg);
 			}
 			zmq_close (s);
 		}
 
-		virtual void on_event_connected(const zmq_event_t &event_) {}
-		virtual void on_event_connect_delayed(const zmq_event_t &event_) {}
-		virtual void on_event_connect_retried(const zmq_event_t &event_) {}
-		virtual void on_event_listening(const zmq_event_t &event_) {}
-		virtual void on_event_bind_failed(const zmq_event_t &event_) {}
-		virtual void on_event_accepted(const zmq_event_t &event_) {}
-		virtual void on_event_accept_failed(const zmq_event_t &event_) {}
-		virtual void on_event_closed(const zmq_event_t &event_) {}
-		virtual void on_event_close_failed(const zmq_event_t &event_) {}
-		virtual void on_event_disconnected(const zmq_event_t &event_) {}
-		virtual void on_event_unknown(const zmq_event_t &event_) {}
+		virtual void on_event_connected(const zmq_event_t &event_, const char* addr_) {}
+		virtual void on_event_connect_delayed(const zmq_event_t &event_, const char* addr_) {}
+		virtual void on_event_connect_retried(const zmq_event_t &event_, const char* addr_) {}
+		virtual void on_event_listening(const zmq_event_t &event_, const char* addr_) {}
+		virtual void on_event_bind_failed(const zmq_event_t &event_, const char* addr_) {}
+		virtual void on_event_accepted(const zmq_event_t &event_, const char* addr_) {}
+		virtual void on_event_accept_failed(const zmq_event_t &event_, const char* addr_) {}
+		virtual void on_event_closed(const zmq_event_t &event_, const char* addr_) {}
+		virtual void on_event_close_failed(const zmq_event_t &event_, const char* addr_) {}
+		virtual void on_event_disconnected(const zmq_event_t &event_, const char* addr_) {}
+		virtual void on_event_unknown(const zmq_event_t &event_, const char* addr_) {}
 	};
 }