diff --git a/CHANGES b/CHANGES
index 1f687409..d8f2577a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -19,7 +19,10 @@ Major release, unreleased
   time the constructor adds the static route, and enables the static route to
   be properly associated with the required host. (``#1559``)
 - ``send_file`` supports Unicode in ``attachment_filename``. (`#2223`_)
+- Pass ``_scheme`` argument from ``url_for`` to ``handle_build_error``.
+  (`#2017`_)
 
+.. _#2017: https://github.com/pallets/flask/pull/2017
 .. _#2223: https://github.com/pallets/flask/pull/2223
 
 Version 0.12.1
diff --git a/flask/helpers.py b/flask/helpers.py
index bfdcf224..828f5840 100644
--- a/flask/helpers.py
+++ b/flask/helpers.py
@@ -331,6 +331,7 @@ def url_for(endpoint, **values):
         values['_external'] = external
         values['_anchor'] = anchor
         values['_method'] = method
+        values['_scheme'] = scheme
         return appctx.app.handle_url_build_error(error, endpoint, values)
 
     if anchor is not None: