diff --git a/include/zmq.h b/include/zmq.h
index e1606a77..99cf41c3 100644
--- a/include/zmq.h
+++ b/include/zmq.h
@@ -368,7 +368,6 @@ ZMQ_EXPORT const char *zmq_msg_gets (const zmq_msg_t *msg, const char *property)
 #define ZMQ_VMCI_BUFFER_MAX_SIZE 87
 #define ZMQ_VMCI_CONNECT_TIMEOUT 88
 #define ZMQ_USE_FD 89
-#define ZMQ_BINDTODEVICE 90
 
 /*  Message options                                                           */
 #define ZMQ_MORE 1
@@ -562,6 +561,9 @@ ZMQ_EXPORT void zmq_threadclose (void* thread);
 #define ZMQ_SCATTER 17
 #define ZMQ_DGRAM 18
 
+/*  DRAFT Socket options.                                                     */
+#define ZMQ_BINDTODEVICE 90
+
 /*  DRAFT 0MQ socket events and monitoring                                    */
 #define ZMQ_EVENT_HANDSHAKE_FAILED  0x0800
 #define ZMQ_EVENT_HANDSHAKE_SUCCEED 0x1000
diff --git a/src/zmq_draft.h b/src/zmq_draft.h
index 9aed6ddd..66adf6a9 100644
--- a/src/zmq_draft.h
+++ b/src/zmq_draft.h
@@ -46,6 +46,9 @@
 #define ZMQ_SCATTER 17
 #define ZMQ_DGRAM 18
 
+/*  DRAFT Socket options.                                                     */
+#define ZMQ_BINDTODEVICE 90
+
 /*  DRAFT 0MQ socket events and monitoring                                    */
 #define ZMQ_EVENT_HANDSHAKE_FAILED  0x0800
 #define ZMQ_EVENT_HANDSHAKE_SUCCEED 0x1000
diff --git a/tests/test_setsockopt.cpp b/tests/test_setsockopt.cpp
index 31a35d7a..de152e51 100644
--- a/tests/test_setsockopt.cpp
+++ b/tests/test_setsockopt.cpp
@@ -113,10 +113,11 @@ void test_setsockopt_use_fd ()
 #define BOUNDDEVBUFSZ 16
 void test_setsockopt_bindtodevice ()
 {
-    int rc;
     void *ctx = zmq_ctx_new ();
     void *socket = zmq_socket (ctx, ZMQ_PUSH);
 
+#ifdef ZMQ_BINDTODEVICE
+    int rc;
     char devname[BOUNDDEVBUFSZ];
     size_t buflen = BOUNDDEVBUFSZ;
 
@@ -137,6 +138,7 @@ void test_setsockopt_bindtodevice ()
     rc = zmq_getsockopt (socket, ZMQ_BINDTODEVICE, devname, &buflen);
     assert(rc == 0);
     assert(!strncmp("testdev", devname, buflen));
+#endif
 
     zmq_close (socket);
     zmq_ctx_term (ctx);