diff --git a/debian/changelog b/debian/changelog
index b8283b76..86bc0ec1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,36 @@
+tvheadend (2.12.99) hts; urgency=low
+
+  * Debian package has been renamed from hts-tvheadend to tvheadend
+
+  * Add functionality to delete recordings
+
+  * Better support for playing in web clients.
+    Temporary tickets are used instead of username/password authentication
+
+  * Remove lock contention in CWC updates
+
+  * Fix bug in IPTV PAT parser (Ticket #318)
+
+  * Store EPG on disk so it can be reloaded on restart
+
+  * Add support for Viaccess EMM
+
+  * Add support for DRECrypt EMM
+
+  * Depend on OpenSSL for cryptographic features
+
+  * RTSP has been dropped. It was too buggy and noone wanted to maintain it
+
+  * Fix bug in JSON encoder. Ticket #163
+
+  * Fix crash in HTTP service. Ticket #334
+
+  * Added http-streaming of services. Tested and working with mplayer.
+
+  * Add support for building RPM packages
+
+ -- Andreas Öman <andreas@lonelycoder.com>  Sat, 19 Feb 2011 12:57:09 +0100
+
 hts-tvheadend (2.12) hts; urgency=low
 
   * Add support for IPTV over IPv6
diff --git a/debian/control b/debian/control
index ee7e9234..c9e5cc54 100644
--- a/debian/control
+++ b/debian/control
@@ -1,15 +1,17 @@
-Source: hts-tvheadend
+Source: tvheadend
 Section: main
 Priority: extra
 Maintainer: Andreas Öman <andreas@lonelycoder.com>
 Build-Depends: debhelper (>= 5)
 Standards-Version: 3.7.3
 
-Package: hts-tvheadend
+Package: tvheadend
 Architecture: any
 Depends: ${shlibs:Depends}, libavahi-client3
 Recommends: xmltv
-Enhances: hts-showtime
+Enhances: showtime
+Replaces: hts-tvheadend
+Homepage: http://www.lonelycoder.com/tvheadend
 Description: HTS Tvheadend
- TV backend for use with hts-showtime and various other clients.
- Based on ffmpeg 'http://www.ffmpeg.org/' and ExtJS 'http://www.extjs.org/'
+ TV backend for use with Showtime, XBMC and various other clients.
+ Uses ExtJS 'http://www.extjs.org/'
diff --git a/debian/rules b/debian/rules
index ac4a519a..7f2b1a1d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,38 +1,31 @@
 #!/usr/bin/make -f
 
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
 DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-config.mak: configure
-	dh_testdir
-	./configure --release --prefix=/usr
+%:
+	dh $@
 
-clean:  
+override_dh_clean:
 	dh_testdir
 	dh_testroot
 	rm -rf build.*
-	dh_clean 
+	dh_clean
 
+override_dh_auto_clean:
+	dh_clean
 
-build: config.mak
+override_dh_auto_configure:
+	dh_testdir
+	./configure --release --prefix=/usr
+
+override_dh_auto_build:
 	$(MAKE)
 
-binary:
-	dh_testdir
-	dh_testroot
-	dh_installdirs
-	dh_install
+override_dh_install:
 	$(MAKE) prefix=$(CURDIR)/debian/hts-tvheadend/usr install
-	dh_installchangelogs 
-	dh_installinit --name tvheadend
-	dh_installdocs
-	dh_installdebconf
-	dh_link
-	dh_strip
-	dh_compress 
-	dh_fixperms
-	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+
+override_dh_installinit:
+	dh_installinit --name tvheadend	
diff --git a/debian/hts-tvheadend.config b/debian/tvheadend.config
similarity index 100%
rename from debian/hts-tvheadend.config
rename to debian/tvheadend.config
diff --git a/debian/hts-tvheadend.docs b/debian/tvheadend.docs
similarity index 100%
rename from debian/hts-tvheadend.docs
rename to debian/tvheadend.docs
diff --git a/debian/hts-tvheadend.postinst b/debian/tvheadend.postinst
similarity index 100%
rename from debian/hts-tvheadend.postinst
rename to debian/tvheadend.postinst
diff --git a/debian/hts-tvheadend.postrm b/debian/tvheadend.postrm
similarity index 100%
rename from debian/hts-tvheadend.postrm
rename to debian/tvheadend.postrm
diff --git a/debian/hts-tvheadend.templates b/debian/tvheadend.templates
similarity index 100%
rename from debian/hts-tvheadend.templates
rename to debian/tvheadend.templates
diff --git a/debian/hts-tvheadend.tvheadend.init b/debian/tvheadend.tvheadend.init
similarity index 100%
rename from debian/hts-tvheadend.tvheadend.init
rename to debian/tvheadend.tvheadend.init