diff --git a/Makefile.buildbot b/Makefile.buildbot
index 68c8bdc54..a6c4bbbc3 100644
--- a/Makefile.buildbot
+++ b/Makefile.buildbot
@@ -8,8 +8,9 @@ test:
 	-s3cmd sync -P htmlcov/ s3://static.scrapy.org/coverage-scrapy-$(BRANCH)/
 
 build:
-	test $(BRANCH) != master || git describe >scrapy/VERSION
-	python extras/makedeb.py build
+	test $(BRANCH) != master || git describe --tags | sed -r 's/([0-9]+.[0-9]*.[0-9]*)(rc|dev)(.*)/\1~\2\3/' >scrapy/VERSION
+	debchange -m -D unstable --force-distribution -v `python setup.py --version`+`date +%s` "Automatic build"
+	debuild -us -uc -b
 
 clean:
 	git checkout debian scrapy/VERSION
diff --git a/debian/changelog b/debian/changelog
index f4f5b9d9c..dde97f9e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-scrapy-SUFFIX (0.11) unstable; urgency=low
+scrapy (0.11) unstable; urgency=low
 
   * Initial release.
 
diff --git a/debian/control b/debian/control
index 15743767b..75225f30d 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: scrapy-SUFFIX
+Source: scrapy
 Section: python
 Priority: optional
 Maintainer: Scrapinghub Team <info@scrapinghub.com>
@@ -6,7 +6,7 @@ Build-Depends: debhelper (>= 7.0.50), python (>=2.7), python-twisted, python-w3l
 Standards-Version: 3.8.4
 Homepage: http://scrapy.org/
 
-Package: scrapy-SUFFIX
+Package: scrapy
 Architecture: all
 Depends: ${python:Depends}, python-lxml, python-twisted, python-openssl,
  python-w3lib (>= 1.8.0), python-queuelib, python-cssselect (>= 0.9), python-six (>=1.5.2)
diff --git a/extras/makedeb.py b/extras/makedeb.py
deleted file mode 100644
index 04dea2cb0..000000000
--- a/extras/makedeb.py
+++ /dev/null
@@ -1,40 +0,0 @@
-import sys, os, glob, shutil
-from subprocess import check_call
-from scrapy import version_info
-
-def build(suffix):
-    for ifn in glob.glob("debian/scrapy.*"):
-        s = open(ifn).read()
-        s = s.replace('SUFFIX', suffix)
-        pre, suf = ifn.split('.', 1)
-        ofn = "%s-%s.%s" % (pre, suffix, suf)
-        with open(ofn, 'w') as of:
-            of.write(s)
-
-    for ifn in ['debian/control', 'debian/changelog']:
-        s = open(ifn).read()
-        s = s.replace('SUFFIX', suffix)
-        with open(ifn, 'w') as of:
-            of.write(s)
-
-    check_call('debchange -m -D unstable --force-distribution -v $(python setup.py --version)+$(date +%s) "Automatic build"', \
-        shell=True)
-    check_call('debuild -us -uc -b', shell=True)
-
-def clean(suffix):
-    for f in glob.glob("debian/python-scrapy%s*" % suffix):
-        if os.path.isdir(f):
-            shutil.rmtree(f)
-        else:
-            os.remove(f)
-
-def main():
-    cmd = sys.argv[1]
-    suffix = '%s.%s' % version_info[:2]
-    if cmd == 'build':
-        build(suffix)
-    elif cmd == 'clean':
-        clean(suffix)
-
-if __name__ == '__main__':
-    main()