diff --git a/lib/includes/spdylay/spdylay.h b/lib/includes/spdylay/spdylay.h
index e39e606..c9537a4 100644
--- a/lib/includes/spdylay/spdylay.h
+++ b/lib/includes/spdylay/spdylay.h
@@ -1199,6 +1199,14 @@ int spdylay_session_want_write(spdylay_session *session);
 void* spdylay_session_get_stream_user_data(spdylay_session *session,
                                            int32_t stream_id);
 
+/**
+ * @function
+ *
+ * Returns the number of frames in the outbound queue. This does not
+ * include the deferred DATA frames.
+ */
+size_t spdylay_session_get_outbound_queue_size(spdylay_session *session);
+
 /**
  * @function
  *
diff --git a/lib/spdylay_pq.c b/lib/spdylay_pq.c
index 193f956..8422596 100644
--- a/lib/spdylay_pq.c
+++ b/lib/spdylay_pq.c
@@ -120,3 +120,8 @@ int spdylay_pq_empty(spdylay_pq *pq)
 {
   return pq->length == 0;
 }
+
+size_t spdylay_pq_size(spdylay_pq *pq)
+{
+  return pq->length;
+}
diff --git a/lib/spdylay_pq.h b/lib/spdylay_pq.h
index 09ce1b9..9835e21 100644
--- a/lib/spdylay_pq.h
+++ b/lib/spdylay_pq.h
@@ -91,4 +91,9 @@ void spdylay_pq_pop(spdylay_pq *pq);
  */
 int spdylay_pq_empty(spdylay_pq *pq);
 
+/*
+ * Returns the number of items in the queue |pq|.
+ */
+size_t spdylay_pq_size(spdylay_pq *pq);
+
 #endif /* SPDYLAY_PQ_H */
diff --git a/lib/spdylay_session.c b/lib/spdylay_session.c
index d6795a5..4b5331b 100644
--- a/lib/spdylay_session.c
+++ b/lib/spdylay_session.c
@@ -2346,3 +2346,8 @@ uint8_t spdylay_session_get_pri_lowest(spdylay_session *session)
     return 0;
   }
 }
+
+size_t spdylay_session_get_outbound_queue_size(spdylay_session *session)
+{
+  return spdylay_pq_size(&session->ob_pq)+spdylay_pq_size(&session->ob_ss_pq);
+}
diff --git a/tests/main.c b/tests/main.c
index 25a95e8..f2b2549 100644
--- a/tests/main.c
+++ b/tests/main.c
@@ -142,6 +142,8 @@ int main(int argc, char* argv[])
                    test_spdylay_session_on_settings_received) ||
       !CU_add_test(pSuite, "session_submit_settings",
                    test_spdylay_submit_settings) ||
+      !CU_add_test(pSuite, "session_get_outbound_queue_size",
+                   test_spdylay_session_get_outbound_queue_size) ||
       !CU_add_test(pSuite, "frame_unpack_nv_spdy2",
                    test_spdylay_frame_unpack_nv_spdy2) ||
       !CU_add_test(pSuite, "frame_unpack_nv_spdy3",
diff --git a/tests/spdylay_pq_test.c b/tests/spdylay_pq_test.c
index 27e52d3..e5bfef6 100644
--- a/tests/spdylay_pq_test.c
+++ b/tests/spdylay_pq_test.c
@@ -37,21 +37,29 @@ void test_spdylay_pq()
 {
   spdylay_pq pq;
   spdylay_pq_init(&pq, pq_compar);
+  CU_ASSERT(spdylay_pq_empty(&pq));
+  CU_ASSERT(0 == spdylay_pq_size(&pq));
   CU_ASSERT(0 == spdylay_pq_push(&pq, "foo"));
+  CU_ASSERT(0 == spdylay_pq_empty(&pq));
+  CU_ASSERT(1 == spdylay_pq_size(&pq));
   CU_ASSERT(strcmp("foo", spdylay_pq_top(&pq)) == 0);
   CU_ASSERT(0 == spdylay_pq_push(&pq, "bar"));
   CU_ASSERT(strcmp("bar", spdylay_pq_top(&pq)) == 0);
   CU_ASSERT(0 == spdylay_pq_push(&pq, "baz"));
   CU_ASSERT(strcmp("bar", spdylay_pq_top(&pq)) == 0);
   CU_ASSERT(0 == spdylay_pq_push(&pq, "C"));
+  CU_ASSERT(4 == spdylay_pq_size(&pq));
   CU_ASSERT(strcmp("C", spdylay_pq_top(&pq)) == 0);  
   spdylay_pq_pop(&pq);
+  CU_ASSERT(3 == spdylay_pq_size(&pq));
   CU_ASSERT(strcmp("bar", spdylay_pq_top(&pq)) == 0);
   spdylay_pq_pop(&pq);
   CU_ASSERT(strcmp("baz", spdylay_pq_top(&pq)) == 0);
   spdylay_pq_pop(&pq);
   CU_ASSERT(strcmp("foo", spdylay_pq_top(&pq)) == 0);
   spdylay_pq_pop(&pq);
+  CU_ASSERT(spdylay_pq_empty(&pq));
+  CU_ASSERT(0 == spdylay_pq_size(&pq));
   CU_ASSERT(0 == spdylay_pq_top(&pq));
   spdylay_pq_free(&pq);
 }
diff --git a/tests/spdylay_session_test.c b/tests/spdylay_session_test.c
index a45a299..47e6d30 100644
--- a/tests/spdylay_session_test.c
+++ b/tests/spdylay_session_test.c
@@ -2022,3 +2022,22 @@ void test_spdylay_submit_settings()
 
   spdylay_session_del(session);
 }
+
+void test_spdylay_session_get_outbound_queue_size()
+{
+  spdylay_session *session;
+  spdylay_session_callbacks callbacks;
+  const char *nv[] = { "version", "HTTP/1.1", NULL };
+
+  memset(&callbacks, 0, sizeof(spdylay_session_callbacks));
+  CU_ASSERT(0 == spdylay_session_client_new(&session, SPDYLAY_PROTO_SPDY3,
+                                            &callbacks, NULL));
+  CU_ASSERT(0 == spdylay_session_get_outbound_queue_size(session));
+
+  CU_ASSERT(0 == spdylay_submit_syn_stream(session, SPDYLAY_CTRL_FLAG_FIN, 1, 7,
+                                           nv, NULL));
+  CU_ASSERT(1 == spdylay_session_get_outbound_queue_size(session));
+
+  CU_ASSERT(0 == spdylay_submit_goaway(session, SPDYLAY_GOAWAY_OK));
+  CU_ASSERT(2 == spdylay_session_get_outbound_queue_size(session));
+}
diff --git a/tests/spdylay_session_test.h b/tests/spdylay_session_test.h
index 134f126..d4636a2 100644
--- a/tests/spdylay_session_test.h
+++ b/tests/spdylay_session_test.h
@@ -63,5 +63,6 @@ void test_spdylay_session_flow_control();
 void test_spdylay_session_on_ctrl_not_send();
 void test_spdylay_session_on_settings_received();
 void test_spdylay_submit_settings();
+void test_spdylay_session_get_outbound_queue_size();
 
 #endif // SPDYLAY_SESSION_TEST_H