diff --git a/src/ctx.cpp b/src/ctx.cpp
index 9c77a6e6..f07f2a05 100644
--- a/src/ctx.cpp
+++ b/src/ctx.cpp
@@ -349,7 +349,8 @@ zmq::io_thread_t *zmq::ctx_t::choose_io_thread (uint64_t affinity_)
     return selected_io_thread;
 }
 
-int zmq::ctx_t::register_endpoint (const char *addr_, endpoint_t &endpoint_)
+int zmq::ctx_t::register_endpoint (const char *addr_,
+        const endpoint_t &endpoint_)
 {
     endpoints_sync.lock ();
 
diff --git a/src/ctx.hpp b/src/ctx.hpp
index 2e1297aa..2327d34d 100644
--- a/src/ctx.hpp
+++ b/src/ctx.hpp
@@ -99,7 +99,7 @@ namespace zmq
         zmq::object_t *get_reaper ();
 
         //  Management of inproc endpoints.
-        int register_endpoint (const char *addr_, endpoint_t &endpoint_);
+        int register_endpoint (const char *addr_, const endpoint_t &endpoint_);
         void unregister_endpoints (zmq::socket_base_t *socket_);
         endpoint_t find_endpoint (const char *addr_);
         void pend_connection (const std::string &addr_,
diff --git a/src/object.cpp b/src/object.cpp
index f4f83b49..7bd9b804 100644
--- a/src/object.cpp
+++ b/src/object.cpp
@@ -137,7 +137,8 @@ void zmq::object_t::process_command (command_t &cmd_)
     }
 }
 
-int zmq::object_t::register_endpoint (const char *addr_, endpoint_t &endpoint_)
+int zmq::object_t::register_endpoint (const char *addr_,
+        const endpoint_t &endpoint_)
 {
     return ctx->register_endpoint (addr_, endpoint_);
 }
diff --git a/src/object.hpp b/src/object.hpp
index 83e7cbb4..714a14f5 100644
--- a/src/object.hpp
+++ b/src/object.hpp
@@ -59,7 +59,8 @@ namespace zmq
 
         //  Using following function, socket is able to access global
         //  repository of inproc endpoints.
-        int register_endpoint (const char *addr_, zmq::endpoint_t &endpoint_);
+        int register_endpoint (const char *addr_,
+                const zmq::endpoint_t &endpoint_);
         void unregister_endpoints (zmq::socket_base_t *socket_);
         zmq::endpoint_t find_endpoint (const char *addr_);
         void pend_connection (const std::string &addr_,
diff --git a/src/socket_base.cpp b/src/socket_base.cpp
index 6e4f18d9..1ea766bd 100644
--- a/src/socket_base.cpp
+++ b/src/socket_base.cpp
@@ -365,7 +365,7 @@ int zmq::socket_base_t::bind (const char *addr_)
         return -1;
 
     if (protocol == "inproc") {
-        endpoint_t endpoint = {this, options};
+        const endpoint_t endpoint = { this, options };
         int rc = register_endpoint (addr_, endpoint);
         if (rc == 0) {
             connect_pending(addr_, this);