diff --git a/scripts/debian/changelog b/scripts/debian/changelog
index a24ae0d..425c9de 100644
--- a/scripts/debian/changelog
+++ b/scripts/debian/changelog
@@ -1,3 +1,9 @@
+lcdproc (0.5.2+cvs20090607) UNRELEASED; urgency=low
+
+  * New snapshot from upstream CVS
+
+ -- Markus Dolze <bsdfan@nurfuerspam.de>  Sun, 07 Jun 2009 11:34:46 +0200
+
 lcdproc (0.5.2+cvs20070501) UNRELEASED; urgency=low
 
   * New snapshot from upstream CVS
diff --git a/scripts/debian/control b/scripts/debian/control
index 4447f9e..2ee3d51 100644
--- a/scripts/debian/control
+++ b/scripts/debian/control
@@ -2,9 +2,10 @@ Source: lcdproc
 Section: utils
 Priority: extra
 Maintainer: Jose Luis Tallon <jltallon@adv-solutions.net>
-Build-Depends: debhelper (>= 5.0.0), pkg-config, xmlto, libncurses5-dev, libusb-dev (>= 0.1.8), libsvga1-dev, libxosd-dev
+Build-Depends: debhelper (>= 5.0.0), pkg-config, xmlto, libncurses5-dev, libusb-dev (>= 0.1.8)
 Uploaders: Jonathan Oxer <jon@debian.org>
-Standards-Version: 3.7.3
+Homepage: http://www.lcdproc.org/
+Standards-Version: 3.8.0
 
 Package: lcdproc
 Architecture: alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 m68k mips mipsel powerpc sparc
@@ -21,5 +22,3 @@ Description: LCD display driver daemon and clients
  load, memory usage, uptime, and a lot more. Custom clients can be
  written using the simple client-server protocol and provided example
  code.
- .
- http://lcdproc.omnipotent.net/  or http://www.lcdproc.org/
diff --git a/scripts/debian/docs b/scripts/debian/docs
index ef834dc..f26bcee 100644
--- a/scripts/debian/docs
+++ b/scripts/debian/docs
@@ -1,4 +1,3 @@
 README
-README.IRman
 TODO
 INSTALL
diff --git a/scripts/debian/patches/userguide_Makefile.diff b/scripts/debian/patches/userguide_Makefile.diff
new file mode 100644
index 0000000..91c52e3
--- /dev/null
+++ b/scripts/debian/patches/userguide_Makefile.diff
@@ -0,0 +1,23 @@
+diff -ur lcdproc-0.5dev.orig/docs/lcdproc-user/Makefile.am lcdproc-0.5dev/docs/lcdproc-user/Makefile.am
+--- lcdproc-0.5dev.orig/docs/lcdproc-user/Makefile.am	2008-10-10 12:08:10.000000000 +0200
++++ lcdproc-0.5dev/docs/lcdproc-user/Makefile.am	2009-06-07 15:27:45.000000000 +0200
+@@ -23,6 +23,6 @@
+ 
+ install-html-userguide: $(xmlto) lcdproc-user.docbook
+ 	$(mkinstalldirs) $(userguidedir)
+-	$(xmlto) html -o $(userguidedir) lcdproc-user.docbook
++	$(xmlto) html -o $(userguidedir) --skip-validation lcdproc-user.docbook
+ 
+ ## EOF
+diff -ur lcdproc-0.5dev.orig/docs/lcdproc-user/Makefile.in lcdproc-0.5dev/docs/lcdproc-user/Makefile.in
+--- lcdproc-0.5dev.orig/docs/lcdproc-user/Makefile.in	2009-06-07 15:14:20.000000000 +0200
++++ lcdproc-0.5dev/docs/lcdproc-user/Makefile.in	2009-06-07 15:29:21.000000000 +0200
+@@ -491,7 +491,7 @@
+ 
+ install-html-userguide: $(xmlto) lcdproc-user.docbook
+ 	$(mkinstalldirs) $(userguidedir)
+-	$(xmlto) html -o $(userguidedir) lcdproc-user.docbook
++	$(xmlto) html -o $(userguidedir) --skip-validation lcdproc-user.docbook
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/scripts/debian/rules b/scripts/debian/rules
index 2562f85..23cb342 100755
--- a/scripts/debian/rules
+++ b/scripts/debian/rules
@@ -27,6 +27,12 @@ endif
 config.status: configure
 	dh_testdir
 	# Add here commands to configure the package.
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+	cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+	cp -f /usr/share/misc/config.guess config.guess
+endif
 	CFLAGS="$(CFLAGS)" ./configure \
 	       --host=$(DEB_HOST_GNU_TYPE) \
 	       --build=$(DEB_BUILD_GNU_TYPE) \
@@ -56,18 +62,11 @@ clean:
 	rm -f build-stamp 
 
 	# Add here commands to clean up after the build process.
-	-$(MAKE) distclean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess config.guess
-endif
+	[ ! -f Makefile ] || $(MAKE) distclean
 	rm -f LCDd.conf.debian
 
 	dh_clean 
 
-
 install: build
 	dh_testdir
 	dh_testroot
@@ -85,7 +84,7 @@ install: build
 
 	# trick: move samples into the correct directory
 	# this saves us from patching Makefile.in files
-	for i in fortune.pl iosock.pl lcdmetar.pl tail.pl x11amp.pl ; do \
+	for i in fortune.pl iosock.pl lcdident.pl lcdmetar.pl tail.pl x11amp.pl ; do \
 	  mv $(CURDIR)/debian/lcdproc/usr/bin/$$i $(CURDIR)/debian/lcdproc/usr/share/doc/lcdproc/examples; \
 	done
 
@@ -108,6 +107,7 @@ binary-arch: build install
 #	dh_installemacsen
 #	dh_installpam
 #	dh_installmime
+#	dh_python
 	dh_installinit --update-rcd-params="defaults 21 79"	# for the lcdproc client
 	dh_installinit --name=LCDd
 	dh_installinit --name=lcdexec --update-rcd-params="defaults 21 79"
@@ -120,7 +120,6 @@ binary-arch: build install
 	dh_compress
 	dh_fixperms
 #	dh_perl
-#	dh_python
 #	dh_makeshlibs
 	dh_installdeb
 	dh_shlibdeps