diff --git a/src/gssapi_client.cpp b/src/gssapi_client.cpp
index 91cb342a..607af3d0 100644
--- a/src/gssapi_client.cpp
+++ b/src/gssapi_client.cpp
@@ -153,9 +153,9 @@ int zmq::gssapi_client_t::decode (msg_t *msg_)
     return 0;
 }
 
-bool zmq::gssapi_client_t::is_handshake_complete () const
+zmq::mechanism_t::status_t zmq::gssapi_client_t::status () const
 {
-    return state == connected;
+    return state == connected? mechanism_t::ready: mechanism_t::handshaking;
 }
 
 int zmq::gssapi_client_t::initialize_context ()
diff --git a/src/gssapi_client.hpp b/src/gssapi_client.hpp
index a7ef227b..b6253921 100644
--- a/src/gssapi_client.hpp
+++ b/src/gssapi_client.hpp
@@ -42,7 +42,7 @@ namespace zmq
         virtual int process_handshake_command (msg_t *msg_);
         virtual int encode (msg_t *msg_);
         virtual int decode (msg_t *msg_);
-        virtual bool is_handshake_complete () const;
+        virtual status_t status () const;
 
     private:
 
diff --git a/src/gssapi_server.cpp b/src/gssapi_server.cpp
index f0fb8ef9..4c10a392 100644
--- a/src/gssapi_server.cpp
+++ b/src/gssapi_server.cpp
@@ -315,9 +315,9 @@ int zmq::gssapi_server_t::zap_msg_available ()
     return rc;
 }
 
-bool zmq::gssapi_server_t::is_handshake_complete () const
+zmq::mechanism_t::status_t zmq::gssapi_server_t::status () const
 {
-    return state == connected;
+    return state == connected? mechanism_t::ready: mechanism_t::handshaking;
 }
 
 int zmq::gssapi_server_t::produce_next_token (msg_t *msg_)
diff --git a/src/gssapi_server.hpp b/src/gssapi_server.hpp
index 84e9a5d7..55c706f2 100644
--- a/src/gssapi_server.hpp
+++ b/src/gssapi_server.hpp
@@ -46,7 +46,7 @@ namespace zmq
         virtual int encode (msg_t *msg_);
         virtual int decode (msg_t *msg_);
         virtual int zap_msg_available ();
-        virtual bool is_handshake_complete () const;
+        virtual status_t status () const;
 
     private: