diff --git a/httpbin/core.py b/httpbin/core.py
index 410db2c..fc53e69 100644
--- a/httpbin/core.py
+++ b/httpbin/core.py
@@ -80,7 +80,7 @@ def view_deny_page():
 def view_origin():
     """Returns Origin IP."""
 
-    return jsonify(origin=request.remote_addr)
+    return jsonify(origin=request.headers.get('X-Forwarded-For', request.remote_addr))
 
 
 @app.route('/headers')
diff --git a/httpbin/helpers.py b/httpbin/helpers.py
index ea45924..6fc6281 100644
--- a/httpbin/helpers.py
+++ b/httpbin/helpers.py
@@ -143,7 +143,7 @@ def get_dict(*keys, **extras):
         args=request.args,
         form=form,
         data=json_safe(data),
-        origin=request.remote_addr,
+        origin=request.headers.get('X-Forwarded-For', request.remote_addr),
         headers=get_headers(),
         files=get_files(),
         json=_json