diff --git a/debian/rules b/debian/rules
index 8171044..c7d34ed 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,26 +1,11 @@
 #!/usr/bin/make -f
 
-# DH_VERBOSE := 1
-
-# some helpful variables - uncomment them if needed
-# shamelessly stolen from http://jmtd.net/log/awk/
-#DEBVERS        := $(shell dpkg-parsechangelog | awk '/^Version:/ {print $$2}')
-#VERSION        := $(shell echo '$(DEBVERS)' | sed -e 's/^[0-9]*://' -e 's/-.*//')
-#DEBFLAVOR      := $(shell dpkg-parsechangelog | awk '/^Distribution:/ {print $$2}')
-#DEBPKGNAME     := $(shell dpkg-parsechangelog | awk '/^Source:/ {print $$2}')
-#DEBIAN_BRANCH  := $(shell awk 'BEGIN{FS="[= ]+"} /debian-branch/ {print $$2}' debian/gbp.conf)
-#GIT_TAG        := $(subst ~,_,$(VERSION))
-NON_INTERACTIVE	:= 1
-# alternatively to manually set those variables you can
-#  include /usr/share/cdbs/1/rules/buildvars.mk
-# and use what is set there.  Any hint whether dh might set variables in
-# a similar manner are welcome.
 
 %:
 	dh $@
 
-#override_dh_auto_install:
-#	$(MAKE) DESTDIR=$$(pwd)/debian/uronode prefix=/usr install
+# Collapse upstream changes file into single file
 
-#get-orig-source:
-#	. debian/get-orig-source
+override_dh_auto_build:
+	cat CHANGES.* > changelog
+	dh_auto_build
diff --git a/debian/uronode.docs b/debian/uronode.docs
new file mode 100644
index 0000000..8d13d9b
--- /dev/null
+++ b/debian/uronode.docs
@@ -0,0 +1,5 @@
+BBS.txt
+COLORS
+FAQ
+URONode.his
+changelog
diff --git a/debian/watch b/debian/watch
index 4d77a7a..aa8f510 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,33 +1,4 @@
 version=3
 
-# Uncomment to examine a Webpage
-# <Webpage URL> <string match>
-#http://www.example.com/downloads.php #PACKAGE#-(.*)\.tar\.gz
-
-# Uncomment to examine a Webserver directory
-#http://www.example.com/pub/#PACKAGE#-(.*)\.tar\.gz
-
-# Uncommment to examine a FTP server
-#ftp://ftp.example.com/pub/#PACKAGE#-(.*)\.tar\.gz debian uupdate
-
-# Uncomment to find new files on sourceforge
 http://sf.net/uronode/uronode-(\d[\d\.]+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
 
-# Uncomment to find new files on GooglePages
-# http://code.google.com/p/#PACKAGE#/downloads/list?can=1 \
-#  .*/#PACKAGE#-([-.\d]+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))|zip)
-
-# Uncomment to find new files on Github
-#  - when using releases:
-# https://github.com/#GITHUBUSER#/#PACKAGE#/releases .*/archive/#PREFIX#(\d[\d.-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz)
-#  - when using tags
-# https://github.com/#GITHUBUSER#/#PACKAGE#/tags .*/#PREFIX#(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
-# Remark: frequently you can do s/#PREFIX#/v?/ since 'v' or nothing is quite common but there are other prefixes possible
-
-# if tweaking of source is needed
-# \
-# debian debian/get-orig-source
-
-# if you need to repack and choose +dfsg prefix
-# opts=dversionmangle=s/[~\+]dfsg[0-9]*// \
-#