diff --git a/Doc/library/mmap.rst b/Doc/library/mmap.rst
index b74a823..2449da0 100644
--- a/Doc/library/mmap.rst
+++ b/Doc/library/mmap.rst
@@ -263,13 +263,18 @@ To map anonymous memory, -1 should be passed as the fileno along with the length
    .. method:: write(bytes)
 
       Write the bytes in *bytes* into memory at the current position of the
-      file pointer; the file position is updated to point after the bytes that
+      file pointer and return the number of bytes written (never less than
+      len(bytes), since if the write fails a :exc:`ValueError` will be
+      raised). The file position is updated to point after the bytes that
       were written. If the mmap was created with :const:`ACCESS_READ`, then
       writing to it will raise a :exc:`TypeError` exception.
 
       .. versionchanged: 3.5
          Writable :term:`bytes-like object` is now accepted.
 
+      .. versionchanged: 3.6
+         The number of bytes written is now returned (previously: *None*).
+
 
    .. method:: write_byte(byte)
 
diff --git a/Lib/test/test_mmap.py b/Lib/test/test_mmap.py
index 0f25742..97aab01 100644
--- a/Lib/test/test_mmap.py
+++ b/Lib/test/test_mmap.py
@@ -713,6 +713,10 @@ class MmapTests(unittest.TestCase):
         gc_collect()
         self.assertIs(wr(), None)
 
+    def test_write_returning_the_number_of_bytes_written(self):
+        mm = mmap.mmap(-1, 16)
+        self.assertEqual(mm.write(b"x"), 1)
+
 class LargeMmapTests(unittest.TestCase):
 
     def setUp(self):
diff --git a/Modules/mmapmodule.c b/Modules/mmapmodule.c
index bb98a99..50cec24 100644
--- a/Modules/mmapmodule.c
+++ b/Modules/mmapmodule.c
@@ -389,6 +389,7 @@ mmap_write_method(mmap_object *self,
                   PyObject *args)
 {
     Py_buffer data;
+    PyObject *result;
 
     CHECK_VALID(NULL);
     if (!PyArg_ParseTuple(args, "y*:write", &data))
@@ -406,9 +407,9 @@ mmap_write_method(mmap_object *self,
     }
     memcpy(self->data + self->pos, data.buf, data.len);
     self->pos = self->pos + data.len;
+    result = PyLong_FromSsize_t(data.len);
     PyBuffer_Release(&data);
-    Py_INCREF(Py_None);
-    return Py_None;
+    return result;
 }
 
 static PyObject *