diff --git a/Makefile b/Makefile
index c720c089b..df50ed77b 100644
--- a/Makefile
+++ b/Makefile
@@ -29,6 +29,7 @@ deb-prepare:
 	mkdir -p $(BUILDBASE)
 	hg archive -t tgz -X .hgtags $(BUILDTAR)
 	tar zxf $(BUILDTAR) -C $(BUILDBASE)
+	rm -f $(BUILDDIR)/Makefile # to avoid confusing dh_auto_build
 	cp -r debian $(BUILDDIR)
 	cd $(BUILDDIR); debchange -m -D unstable --force-distribution -v $(FULL_VERSION)-$(DEBREV) "Automatic build"
 
diff --git a/debian/rules b/debian/rules
index ae5f7608e..7b763ab5d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,3 +9,4 @@ export DH_ALWAYS_EXCLUDE=license.txt:_sources/:.buildinfo
 override_dh_auto_install:
 	dh_auto_install
 	mv $(CURDIR)/debian/scrapy/usr/bin/scrapy-ctl.py $(CURDIR)/debian/scrapy/usr/bin/scrapy-ctl
+	mv $(CURDIR)/debian/scrapy/usr/bin/scrapy-ws.py $(CURDIR)/debian/scrapy/usr/bin/scrapy-ws
diff --git a/setup.py b/setup.py
index a682fe76b..c33b74105 100644
--- a/setup.py
+++ b/setup.py
@@ -92,7 +92,7 @@ setup_args = {
     'packages': packages,
     'cmdclass': cmdclasses,
     'data_files': data_files,
-    'scripts': ['bin/scrapy-ctl.py'],
+    'scripts': ['bin/scrapy-ctl.py', 'bin/scrapy-ws.py'],
     'classifiers': [
         'Programming Language :: Python',
         'Programming Language :: Python :: 2.5',