diff --git a/lib/includes/spdylay/spdylay.h b/lib/includes/spdylay/spdylay.h
index ca2da997..26f5122f 100644
--- a/lib/includes/spdylay/spdylay.h
+++ b/lib/includes/spdylay/spdylay.h
@@ -489,32 +489,20 @@ int spdylay_submit_goaway(spdylay_session *session);
  * 2. If server's list contains "http/1.1", this function selects
  *    "http/1.1" and returns 0. The following step is not taken.
  *
- * 3. This function selects "spdy/2" and returns -1. (So called
- *    non-overlap case).
+ * 3. This function selects nothing and returns -1. (So called
+ *    non-overlap case). In this case, |out| and |outlen| are left
+ *    untouched.
  *
  * When spdylay supports updated version of SPDY in the future, this
  * function may select updated protocol and application code which
  * relies on spdylay for SPDY stuff needs not be modified.
  *
- * For rationale of step 3, NPN draft permits that client can select
- * any protocol even if server does not advertise it at the time of
- * this writing:
- *
- *   It's expected that a client will have a list of protocols that it
- *   supports, in preference order, and will only select a protocol if
- *   the server supports it. In that case, the client SHOULD select
- *   the first protocol advertised by the server that it also
- *   supports. In the event that the client doesn't support any of
- *   server's protocols, or the server doesn't advertise any, it
- *   SHOULD select the first protocol that it supports.
- *
- *   There are cases where the client knows that a server supports an
- *   unadvertised protocol. In these cases the client should simply
- *   select that protocol.
- *
  * Selecting "spdy/2" means that "spdy/2" is written into |*out| and
  * length of "spdy/2" (which is 6) is assigned to |*outlen|.
  *
+ * See http://technotes.googlecode.com/git/nextprotoneg.html for more
+ * details about NPN.
+ *
  * To use this method you should do something like:
  *
  * static int select_next_proto_cb(SSL* ssl,
diff --git a/lib/spdylay_npn.c b/lib/spdylay_npn.c
index 971b1f2f..5bd0221d 100644
--- a/lib/spdylay_npn.c
+++ b/lib/spdylay_npn.c
@@ -31,9 +31,6 @@ int spdylay_select_next_protocol(unsigned char **out, unsigned char *outlen,
 {
   int http_selected = 0;
   unsigned int i = 0;
-  /* For non-overlap case */
-  *out = (unsigned char*)"spdy/2";
-  *outlen = 6;
   for(; i < inlen; i += in[i]+1) {
     if(in[i] == 6 && memcmp(&in[i+1], "spdy/2", in[i]) == 0) {
       *out = (unsigned char*)&in[i+1];
diff --git a/tests/spdylay_npn_test.c b/tests/spdylay_npn_test.c
index f49a7194..5f8ce42b 100644
--- a/tests/spdylay_npn_test.c
+++ b/tests/spdylay_npn_test.c
@@ -64,12 +64,12 @@ static void no_overlap()
     8, 's', 'p', 'd', 'y', '/', '2', '.', '1',
     8, 'h', 't', 't', 'p', '/', '1', '.', '0',
   };
-  unsigned char outlen;
-  unsigned char* out;
+  unsigned char outlen = 0;
+  unsigned char* out = NULL;
   CU_ASSERT(-1 == spdylay_select_next_protocol(&out, &outlen,
                                                spdy, sizeof(spdy)));
-  CU_ASSERT(6 == outlen);
-  CU_ASSERT(memcmp("spdy/2", out, outlen) == 0);
+  CU_ASSERT(0 == outlen);
+  CU_ASSERT(NULL == out);
 }
 
 void test_spdylay_npn()