diff --git a/debian/changelog b/debian/changelog
index fe39e70..773fc5e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+g15daemon (1.9.0-wip.20070910-3) unstable; urgency=low
+
+  * first try to make a debian/rules full working for
+    svn and released version
+  * fix directory fixes (closes: #442296)
+  
+ -- Giacomo Catenazzi <cate@debian.org>  Fri, 14 Sep 2007 20:59:27 +0200
+
 g15daemon (1.9.0-wip.20070910-2) unstable; urgency=low
 
   * pause() instead of busy loop.
diff --git a/debian/copyright b/debian/copyright
index 649c1da..5eff502 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -23,6 +23,6 @@ License:
 
 License can be found in the file `/usr/share/common-licenses/GPL-2'.
 
-The Debian packaging is (C) 2007, Giacomo A. Catenazzi <cate@debian.org> and
+The Debian packaging is (C) 2007, Giacomo Catenazzi <cate@debian.org> and
 is licensed under the GPL v2 (or later), see `/usr/share/common-licenses/GPL-2'.
 
diff --git a/debian/g15daemon.install b/debian/g15daemon.install
index f5215e2..d615007 100644
--- a/debian/g15daemon.install
+++ b/debian/g15daemon.install
@@ -1,6 +1,6 @@
 debian/tmp/usr/sbin/g15daemon usr/sbin
-debian/tmp/usr/lib/g15daemon/1.9pre/plugins/g15plugin_uinput.so usr/lib/g15daemon/plugins-1.9pre/
-debian/tmp/usr/lib/g15daemon/1.9pre/plugins/g15plugin_tcpserver.so usr/lib/g15daemon/plugins/1.9pre/
-debian/tmp/usr/lib/g15daemon/1.9pre/plugins/g15plugin_clock.so usr/lib/g15daemon/plugins-1.9pre/
-debian/tmp/usr/share/g15daemon/splash/g15logo2.wbmp usr/share/g15daemon/splash/
+debian/tmp/usr/lib/g15daemon/1.9pre/plugins/g15plugin_uinput.so    usr/lib/g15daemon/1.9pre/plugins/
+debian/tmp/usr/lib/g15daemon/1.9pre/plugins/g15plugin_tcpserver.so usr/lib/g15daemon/1.9pre/plugins/
+debian/tmp/usr/lib/g15daemon/1.9pre/plugins/g15plugin_clock.so     usr/lib/g15daemon/1.9pre/plugins/
+debian/tmp/usr/share/g15daemon/splash/g15logo2.wbmp                usr/share/g15daemon/splash/
 
diff --git a/debian/rules b/debian/rules
index e735f9b..5e7d92b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,19 @@
 #!/usr/bin/make -f
 
-DEB_MAKE_CLEAN_TARGET = distclean
+
+AUTOMAKE_REMOVE := Makefile Makefile.in */Makefile */Makefile.in configure aclocal.m4
+AUTOMAKE_REMOVE += *.lo *.o *.la */*.lo */*.o */*.la
+AUTOMAKE_REMOVE += g15daemon/g15daemon g15daemon/g15daemontest
+AUTOMAKE_REMOVE += config.status config.log config.h config.h.in config/* libtool stamp-h1
+AUTOMAKE_REMOVE += */.libs/
 
 clean::
-	-rm -Rf plugins/.libs/ libg15daemon_client/.libs/ g15daemon/.libs/
-	-rm -f */*.o */*.la */*.lo g15daemon/g15daemontest g15daemon/g15daemon stamp-h1
-	-rm -f config/* configure config.log config.status Makefile.in */Makefile.in aclocal.m4 config.h.in Makefile */Makefile libtool config.h
+	-rm -Rf $(AUTOMAKE_REMOVE)
 
-makebuilddir/g15daemon::
+makebuilddir:: Makefile
+
+
+Makefile:: Makefile.am autogen.sh
 	[ -d config ] || mkdir config
 	aclocal -I config
 	libtoolize --automake --force --copy
@@ -18,4 +24,3 @@ makebuilddir/g15daemon::
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 
-
diff --git a/debian/watch b/debian/watch
index 69e3b7f..ad435f6 100644
--- a/debian/watch
+++ b/debian/watch
@@ -3,6 +3,5 @@
 # Compulsory line, this is a version 3 file
 version=3
 
-http://sf.net/g15daemon/g15daemon-(.*)\.tar\.bz2
-
+http://sf.net/g15daemon/g15daemon-([1-9].*)\.tar\.bz2