diff --git a/src/ssl/connection.c b/src/ssl/connection.c
index 9abb736..1dff37c 100755
--- a/src/ssl/connection.c
+++ b/src/ssl/connection.c
@@ -23,8 +23,8 @@
 #endif
 
 #define SSL_MODULE
+#include <openssl/bio.h>
 #include <openssl/err.h>
-
 #include "ssl.h"
 
 /**
@@ -319,7 +319,7 @@
         /*
          * There was a problem with the BIO_write of some sort.
          */
-        handle_bio_errors(self->from_ssl, ret);
+        handle_bio_errors(self->into_ssl, ret);
         return NULL;
     }
 
@@ -770,6 +770,25 @@
     return tuple;
 }
 
+static char ssl_Connection_bio_shutdown_doc[] = "\n\
+When using non-socket connections this function signals end of\n\
+data on the input for this connection.\n\
+\n\
+Arguments: self - The Connection object\n\
+           args - The Python argument tuple, should be empty.\n\
+Returns:   Nothing\n\
+";
+
+static PyObject *
+ssl_Connection_bio_shutdown(ssl_ConnectionObj *self, PyObject *args)
+{
+    BIO_set_mem_eof_return(self->into_ssl, 0);
+    Py_INCREF(Py_None);
+    return Py_None;
+}
+
+
+
 static char ssl_Connection_shutdown_doc[] = "\n\
 Send closure alert\n\
 \n\
@@ -1127,6 +1146,7 @@
     ADD_METHOD(connect),
     ADD_METHOD(connect_ex),
     ADD_METHOD(accept),
+    ADD_METHOD(bio_shutdown),
     ADD_METHOD(shutdown),
     ADD_METHOD(get_cipher_list),
     ADD_METHOD(makefile),
diff --git a/test/test_ssl.py b/test/test_ssl.py
index f09819c..98d6796 100644
--- a/test/test_ssl.py
+++ b/test/test_ssl.py
@@ -584,3 +584,16 @@
         # We can rely on all of these bytes being received at once because
         # _loopback passes 2 ** 16 to recv - more than 2 ** 15.
         self.assertEquals(len(received), sent)
+
+
+    def test_shutdown(self):
+        """
+        L{Connection.bio_shutdown} signals the end of the data stream from
+        which the L{Connection} reads.
+        """
+        server = self._server()
+        server.bio_shutdown()
+        e = self.assertRaises(Error, server.recv, 1024)
+        # We don't want WantReadError or ZeroReturnError or anything - it's a
+        # handshake failure.
+        self.assertEquals(e.__class__, Error)