diff --git a/Makefile b/Makefile
deleted file mode 100644
index d470c37..0000000
--- a/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-
-all: weighttp
-
-override SOURCES := $(wildcard src/*.c)
-override OBJECTS := $(patsubst %.c,%.o,$(SOURCES))
-
-override LDFLAGS += -lev -lpthread
-override CFLAGS += '-DVERSION="0.2"'
-
-weighttp: $(OBJECTS)
-	$(CC) $(LDFLAGS) -o weighttp $^
-
-install: weighttp
-	mkdir -p $(DESTDIR)/usr/bin
-	cp weighttp $(DESTDIR)/usr/bin/
-
-clean:
-	rm -f weighttp $(OBJECTS)
-
-.PHONY: all install clean
diff --git a/debian/changelog b/debian/changelog
index 85ef5ec..f42b53d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+weighttp (0.3-3) unstable; urgency=low
+
+  * remove Makefile from debian branch, use quilt. fix Makefile.
+
+ -- Stefan Bühler <stbuehler@web.de>  Fri, 10 May 2013 13:54:24 +0200
+
 weighttp (0.3-2) unstable; urgency=low
 
   [ Jyri J. Virkki ]
diff --git a/debian/control b/debian/control
index c3f4f43..333a289 100644
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,8 @@
 Source: weighttp
 Section: net
 Priority: extra
-Maintainer: Stefan Bühler <source@stbuehler.de>
-Build-Depends: debhelper (>= 9), libev-dev, cdbs
+Maintainer: Stefan Bühler <stbuehler@web.de>
+Build-Depends: debhelper (>= 9), libev-dev
 Standards-Version: 3.9.4
 Homepage: http://weighttp.lighttpd.net/
 Vcs-Git: git://git.lighttpd.net/weighttp
diff --git a/debian/copyright b/debian/copyright
index 141fc30..cc38a26 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,7 +6,7 @@ It was downloaded from:
 
     http://weighttp.lighttpd.net/
 
-Upstream Author(s):
+Upstream Author:
 
     Thomas Porzelt <tp@cryosphere.de>
 
diff --git a/debian/patches/0001-Makefile-to-replace-waf-handling.patch b/debian/patches/0001-Makefile-to-replace-waf-handling.patch
new file mode 100644
index 0000000..7453902
--- /dev/null
+++ b/debian/patches/0001-Makefile-to-replace-waf-handling.patch
@@ -0,0 +1,37 @@
+From: =?UTF-8?q?Stefan=20B=C3=BChler?= <stbuehler@web.de>
+Date: Fri, 10 May 2013 13:48:29 +0200
+Subject: Makefile to replace waf handling
+
+---
+ Makefile |   22 ++++++++++++++++++++++
+ 1 file changed, 22 insertions(+)
+ create mode 100644 Makefile
+
+diff --git a/Makefile b/Makefile
+new file mode 100644
+index 0000000..741b8a1
+--- /dev/null
++++ b/Makefile
+@@ -0,0 +1,22 @@
++
++all: weighttp
++
++override SOURCES := $(wildcard src/*.c)
++override OBJECTS := $(patsubst %.c,%.o,$(SOURCES))
++
++# VERSION must be set in env
++
++LIBS += -lev -lpthread
++override CFLAGS += '-DVERSION="$(VERSION)"'
++
++weighttp: $(OBJECTS)
++	$(CC) $(LDFLAGS) -o weighttp $^ $(LIBS)
++
++install: weighttp
++	mkdir -p $(DESTDIR)/usr/bin
++	cp weighttp $(DESTDIR)/usr/bin/
++
++clean:
++	rm -f weighttp $(OBJECTS)
++
++.PHONY: all install clean
diff --git a/debian/patches/0001-Fix-header-parsing-to-compare-HTTP-header-field-name.patch b/debian/patches/0002-Fix-header-parsing-to-compare-HTTP-header-field-name.patch
similarity index 100%
rename from debian/patches/0001-Fix-header-parsing-to-compare-HTTP-header-field-name.patch
rename to debian/patches/0002-Fix-header-parsing-to-compare-HTTP-header-field-name.patch
diff --git a/debian/patches/0002-Corrected-Host-header-handling-fixes-2477.patch b/debian/patches/0003-Corrected-Host-header-handling-fixes-2477.patch
similarity index 100%
rename from debian/patches/0002-Corrected-Host-header-handling-fixes-2477.patch
rename to debian/patches/0003-Corrected-Host-header-handling-fixes-2477.patch
diff --git a/debian/patches/0003-User-Agent-header-no-longer-needs-a-leading-space.patch b/debian/patches/0004-User-Agent-header-no-longer-needs-a-leading-space.patch
similarity index 100%
rename from debian/patches/0003-User-Agent-header-no-longer-needs-a-leading-space.patch
rename to debian/patches/0004-User-Agent-header-no-longer-needs-a-leading-space.patch
diff --git a/debian/patches/series b/debian/patches/series
index 41771ca..5a5b309 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
-0001-Fix-header-parsing-to-compare-HTTP-header-field-name.patch
-0002-Corrected-Host-header-handling-fixes-2477.patch
-0003-User-Agent-header-no-longer-needs-a-leading-space.patch
+0001-Makefile-to-replace-waf-handling.patch
+0002-Fix-header-parsing-to-compare-HTTP-header-field-name.patch
+0003-Corrected-Host-header-handling-fixes-2477.patch
+0004-User-Agent-header-no-longer-needs-a-leading-space.patch
diff --git a/debian/rules b/debian/rules
index 88e8274..891baf5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,7 @@
 #!/usr/bin/make -f
 
-DEB_MAKE_INSTALL_TARGET=install
+VERSION := $(shell dpkg-parsechangelog | awk '/Version:/ { print $2 }' | sed -e 's/-[^-]*$$//')
+export VERSION
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/makefile.mk
-
-DEB_MAKE_INSTALL_TARGET := install DESTDIR=$(CURDIR)/debian/weighttpd
-DEB_MAKE_CHECK_TARGET   :=
-
-# Add here any variable or target overrides you need.
+%:
+	dh $@
diff --git a/debian/source/format b/debian/source/format
index d3827e7..163aaf8 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-1.0
+3.0 (quilt)