diff --git a/debian/changelog b/debian/changelog
index face677528..01f08e28d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-lazarus (0.9.13-1) experimental; urgency=low
+lazarus (0.9.17-1) experimental; urgency=low
 
-  * New upstream release.
+  * Snapshot.
 
- -- Micha Nelissen <micha@neli.hopto.org>  Sun, 26 Mar 2006 14:56:00 +0100
+ -- Micha Nelissen <micha@neli.hopto.org>  Fri, 21 Jul 2006 16:09:00 +0200
 
 lazarus (0.9.2-2) experimental; urgency=low
 
diff --git a/debian/move-usr-lib.sh b/debian/move-usr-lib.sh
index 307e2dd369..f96875bff7 100644
--- a/debian/move-usr-lib.sh
+++ b/debian/move-usr-lib.sh
@@ -1,19 +1,21 @@
 LAZDEBDIR=$1
-for i in `find -maxdepth 1 -not -name debian -and -not -name '.'`; do
-    cp -Rl $i $LAZDEBDIR/usr/share/lazarus
+LAZTARGET=lib
+for i in `find -maxdepth 1 -not -name debian -and -not -name install -and -not -name '.'`; do
+    cp -Rl $i $LAZDEBDIR/usr/$LAZTARGET/lazarus
 done
-rm $LAZDEBDIR/usr/share/lazarus/lcl/COPYING
-rm $LAZDEBDIR/usr/share/lazarus/COPYING.GPL
-rm $LAZDEBDIR/usr/share/lazarus/COPYING.LGPL
-rm $LAZDEBDIR/usr/share/lazarus/COPYING.modifiedLGPL
-rm $LAZDEBDIR/usr/share/lazarus/COPYING
-cd $LAZDEBDIR/usr/share/lazarus
-mv lazarus ../../lib/lazarus
-mv startlazarus ../../lib/lazarus
-mv tools/svn2revisioninc ../../lib/lazarus/tools/svn2revisioninc
-for i in `find -type d -name 'lib' -or -name 'units'`; do
-        d=`dirname $i`
-        mkdir -p ../../lib/lazarus/$d
-        mv $i ../../lib/lazarus/$d			  
-done
-
+rm $LAZDEBDIR/usr/$LAZTARGET/lazarus/lcl/COPYING
+rm $LAZDEBDIR/usr/$LAZTARGET/lazarus/COPYING.GPL
+rm $LAZDEBDIR/usr/$LAZTARGET/lazarus/COPYING.LGPL
+rm $LAZDEBDIR/usr/$LAZTARGET/lazarus/COPYING.modifiedLGPL
+rm $LAZDEBDIR/usr/$LAZTARGET/lazarus/COPYING
+if [ "$LAZTARGET" = "share" ]; then
+    cd $LAZDEBDIR/usr/share/lazarus
+    mv lazarus ../../lib/lazarus
+    mv startlazarus ../../lib/lazarus
+    mv tools/svn2revisioninc ../../lib/lazarus/tools/svn2revisioninc
+    for i in `find -type d -name 'lib' -or -name 'units'`; do
+            d=`dirname $i`
+            mkdir -p ../../lib/lazarus/$d
+            mv $i ../../lib/lazarus/$d			  
+    done
+fi
diff --git a/debian/rules b/debian/rules
old mode 100644
new mode 100755
index 418b2b892a..09dab6a462
--- a/debian/rules
+++ b/debian/rules
@@ -26,7 +26,7 @@ build-stamp: configure-stamp
 	dh_testdir
 
 	# Add here commands to compile the package.
-	$(MAKE)
+	$(MAKE) USESVN2REVISIONINC=0
 	#/usr/bin/docbook-to-man debian/lazarus.sgml > lazarus.1
 
 	touch build-stamp
@@ -50,7 +50,6 @@ install: build
 	# Add here commands to install the package into debian/lazarus.
 	
 	# copy lazarus to /usr/share
-	install -d $(LAZDEBDIR)/usr/share/lazarus
 	install -d $(LAZDEBDIR)/usr/lib/lazarus
 	install -d $(LAZDEBDIR)/usr/bin
 	
@@ -58,12 +57,12 @@ install: build
 	
 	# copy icons and menu entries for the GNOME menu
 	install -d $(LAZDEBDIR)/usr/share/pixmaps
-	install -d $(LAZDEBDIR)/usr/share/gnome/apps/Development
+	install -d $(LAZDEBDIR)/usr/share/applications
 	install -d $(LAZDEBDIR)/usr/bin
 	
 	convert -geometry 32x32 $(CURDIR)/images/ide_icon48x48.png $(LAZDEBDIR)/usr/share/pixmaps/lazarus.xpm
 	chmod 644 $(LAZDEBDIR)/usr/share/pixmaps/lazarus.xpm
-	install -m 644 $(CURDIR)/install/lazarus.desktop $(LAZDEBDIR)/usr/share/gnome/apps/Development/lazarus.desktop
+	install -m 644 $(CURDIR)/install/lazarus.desktop $(LAZDEBDIR)/usr/share/applications/lazarus.desktop
 	
 # Build architecture-independent files here.
 binary-indep: build install
diff --git a/docs/xml/multi_makeskel.pl b/docs/xml/multi_makeskel.pl
old mode 100644
new mode 100755
diff --git a/install/lazarus.desktop b/install/lazarus.desktop
index 6b779b8fc5..218544cd45 100644
--- a/install/lazarus.desktop
+++ b/install/lazarus.desktop
@@ -1,12 +1,12 @@
 [Desktop Entry]
 Name=Lazarus
 Comment=Lazarus IDE
-Exec=startlazarus %f
-Terminal=0
+Exec=/usr/lib/lazarus/startlazarus %f
+Terminal=false
 Type=Application
-Icon=lazarus.png
+Icon=lazarus.xpm
 Encoding=UTF-8
-Categories=IDE;Development;X-Red-Hat-Base;Application;
+Categories=Application;IDE;Development;Programming;
 StartupWMClass=Lazarus
 MimeType=text/x-pascal;
 
diff --git a/tools/find_non_cvs_files.pl b/tools/find_non_cvs_files.pl
old mode 100644
new mode 100755