diff --git a/CHANGES.rst b/CHANGES.rst
index 50b85678c..580146876 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -3,8 +3,12 @@
 Version 0.16.1
 --------------
 
+Unreleased
+
 -   Fix import location in deprecation messages for subpackages.
     :issue:`1663`
+-   Fix an SSL error on Python 3.5 when the dev server responds with no
+    content. :issue:`1659`
 
 
 Version 0.16.0
diff --git a/src/werkzeug/serving.py b/src/werkzeug/serving.py
index d817120f2..19ac92fc8 100644
--- a/src/werkzeug/serving.py
+++ b/src/werkzeug/serving.py
@@ -273,7 +273,9 @@ def write(data):
                 self.end_headers()
 
             assert isinstance(data, bytes), "applications must write bytes"
-            self.wfile.write(data)
+            if data:
+                # Only write data if there is any to avoid Python 3.5 SSL bug
+                self.wfile.write(data)
             self.wfile.flush()
 
         def start_response(status, response_headers, exc_info=None):