diff --git a/websocket.py b/websocket.py
index 51ec1f6..53141a9 100644
--- a/websocket.py
+++ b/websocket.py
@@ -423,7 +423,11 @@ class WebSocket(object):
         else:
             hostport = "%s:%d" % (host, port)
         headers.append("Host: %s" % hostport)
-        headers.append("Origin: %s" % hostport)
+        
+        if "origin" in options:
+            headers.append("Origin: %s" % options["origin"])
+        else:
+            headers.append("Origin: %s" % hostport)
 
         key = _create_sec_websocket_key()
         headers.append("Sec-WebSocket-Key: %s" % key)