diff --git a/Makefile b/rebind/Makefile
similarity index 100%
rename from Makefile
rename to rebind/Makefile
diff --git a/rebind b/rebind/rebind
similarity index 100%
rename from rebind
rename to rebind/rebind
diff --git a/rebind.c b/rebind/rebind.c
similarity index 100%
rename from rebind.c
rename to rebind/rebind.c
diff --git a/websockify/proxy.py b/websockify/proxy.py
index 7a46cec..cd83709 100644
--- a/websockify/proxy.py
+++ b/websockify/proxy.py
@@ -47,11 +47,12 @@ Traffic Legend:
         self.wrap_times    = [0, 0, 0]
 
         if self.wrap_cmd:
-            rebinder_path = ['./', os.path.dirname(sys.argv[0])]
+            rebinder_path = ['./', os.path.dirname(sys.argv[0]), 'rebind/']
             self.rebinder = None
 
             for rdir in rebinder_path:
                 rpath = os.path.join(rdir, "rebind.so")
+                print rpath
                 if os.path.exists(rpath):
                     self.rebinder = rpath
                     break