diff --git a/build/deb/apache.conf b/build/deb/apache.conf
index fa29149ee59..d37b433fb98 100644
--- a/build/deb/apache.conf
+++ b/build/deb/apache.conf
@@ -4,7 +4,7 @@
 Alias /dolibarr /usr/share/dolibarr/htdocs
 </IfModule>
 
-# You can also use dolibarr as a VirtualHost
+# You can also use phpLDAPadmin as a VirtualHost
 # <VirtualHost *:*>
 #     ServerName mydolibarrhostname.com
 #     ServerAdmin root@example.com
@@ -13,10 +13,7 @@ Alias /dolibarr /usr/share/dolibarr/htdocs
 #     CustomLog logs/ldap.example.com-access.log common
 # </VirtualHost>
 
-# Directory for web pages
-<DirectoryMatch /usr/share/dolibarr>
-  Order deny,allow
-  Allow from all
+<Directory /usr/share/dolibarr/htdocs>
   DirectoryIndex index.php
   Options +FollowSymLinks +Indexes
 
@@ -56,23 +53,16 @@ Alias /dolibarr /usr/share/dolibarr/htdocs
     #ExpiresByType application/x-javascript A2592000
     #ExpiresByType application/javascript A2592000
 
-</DirectoryMatch>
+</Directory>
 
-# Directory for public pages
-<DirectoryMatch /usr/share/dolibarr/htdocs/public>
+<Directory /usr/share/dolibarr/htdocs/public/>
     AllowOverride All
     Order deny,allow
     Allow from all
-</DirectoryMatch>
+</Directory>
 
-# Directory for data files
-<DirectoryMatch /usr/share/dolibarr/documents>
+<Directory /var/lib/dolibarr>
     AllowOverride All
     Order deny,allow
     Allow from all
-</DirectoryMatch>
-<DirectoryMatch /var/lib/dolibarr>
-    AllowOverride All
-    Order deny,allow
-    Allow from all
-</DirectoryMatch>
+</Directory>
diff --git a/build/deb/changelog b/build/deb/changelog
index d75fd100a60..182110624de 100644
--- a/build/deb/changelog
+++ b/build/deb/changelog
@@ -1,4 +1,4 @@
-dolibarr 3.1.0 unstable; urgency=low
+ dolibarr 3.1.0 unstable; urgency=low
   * New 3.1.0 release
     More information into /usr/share/dolibarr/ChangeLog file.
  -- maintainer Laurent Destailleur <eldy@users.sourceforge.net>  2011-07-09
\ No newline at end of file
diff --git a/build/deb/control b/build/deb/control
index 19eb51664e7..3f564f5608f 100644
--- a/build/deb/control
+++ b/build/deb/control
@@ -9,7 +9,7 @@ Section: web
 Priority: optional
 Recommends: mozilla | netscape
 Homepage: http://www.dolibarr.org
-Description: An ERP & CRM software to manage your activity.
+Description: ERP & CRM software to manage your activity.
  Dolibarr ERP & CRM is an easy to use open source/free software for small 
  and medium companies, foundations or freelances. It includes different 
  features for Enterprise Resource Planning (ERP) and Customer Relationship
diff --git a/build/deb/copyright b/build/deb/copyright
index 74752ea4864..00aafd563b1 100644
--- a/build/deb/copyright
+++ b/build/deb/copyright
@@ -1 +1,4 @@
+Copyright 2011 Laurent Destailleur <eldy@users.sourceforge.net>
+
+This software is distributed under GPL v2 licence.
 See file /usr/share/common-licenses/GPL-2
\ No newline at end of file
diff --git a/build/deb/install.forced.php.install b/build/deb/install.forced.php.install
index 1166abe41ae..198565d3211 100755
--- a/build/deb/install.forced.php.install
+++ b/build/deb/install.forced.php.install
@@ -4,13 +4,12 @@
 // This file must be present into htdocs/install directory
 // during install process to be used.
 //
-// $Id: install.forced.php.install,v 1.7 2011/07/09 15:48:19 eldy Exp $
+// $Id: install.forced.php.install,v 1.6 2011/07/09 14:11:40 eldy Exp $
 //
-
 $force_install_noedit=1;
 $force_install_message='KeepDefaultValuesDeb';
-$force_install_main_data_root='/usr/share/dolibarr/documents';
-#$force_install_main_data_root='/var/lib/dolibarr';
+#$force_install_main_data_root='/usr/share/dolibarr/documents';
+$force_install_main_data_root='/var/lib/dolibarr';
 $force_install_type='mysqli';
 $force_install_dbserver='localhost';
 $force_install_port='3306';
diff --git a/build/deb/postinst b/build/deb/postinst
index be9fb7521b7..4d065f58ca0 100644
--- a/build/deb/postinst
+++ b/build/deb/postinst
@@ -49,21 +49,19 @@ case "$1" in
 			cat $fileorig | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $config
 		fi
 		
-        # Create document directory
-        #docdir='/var/lib/dolibarr/documents'
-        docdir='/usr/share/dolibarr/documents'
-        mkdir -p $docdir
-        chown -R www-data:www-data $docdir
-        chmod -R 775 $docdir
-        chmod -R g+s $docdir
+        # Create /var/lib/dolibarr/documents
+        mkdir -p /var/lib/dolibarr/documents
+        chown -R www-data:www-data /var/lib/dolibarr/documents;
+        chmod -R 775 /var/lib/dolibarr/documents;
+        chmod -R g+s /var/lib/dolibarr/documents;
 
 		# Create an empty conf.php with permission to web server
 		if [ ! -f /usr/share/dolibarr/htdocs/conf/conf.php ]
 		then 
 			echo Create empty file /usr/share/dolibarr/htdocs/conf/conf.php		
 			touch /usr/share/dolibarr/htdocs/conf/conf.php
-			chown -R www-data:www-data /usr/share/dolibarr/htdocs/conf/conf.php
-	    	chmod -R 750 /usr/share/dolibarr/htdocs/conf/conf.php
+			chown -R www-data:www-data /usr/share/dolibarr/htdocs/conf/conf.php;
+	    	chmod -R 750 /usr/share/dolibarr/htdocs/conf/conf.php;
 		fi
 
 		#db_reset "dolibarr/webserver"
@@ -108,6 +106,12 @@ case "$1" in
 			
 		done
 
+		# Copy icon file
+		#echo "Copy icon file"
+		#fileorig="/usr/share/dolibarr/doc/images/dolibarr.xpm"
+		#target="/usr/share/pixmaps/"
+		#cp -f $fileorig $target
+
 		#echo "Install menu entry"
 		# This one is for Gnome ubuntu
 		#fileorig="/usr/share/dolibarr/build/deb/dolibarr.desktop"
diff --git a/build/deb/templates b/build/deb/templates
index 82fcaa1ba48..3b370ee68f2 100644
--- a/build/deb/templates
+++ b/build/deb/templates
@@ -91,6 +91,6 @@ Template: dolibarr/postrm
 Type: boolean
 Default: true
 Description: Delete database ?
- Do I have to delete also the Dolibarr MySQL database and all its datas
- (datas subjected to this quetion are the Dolibarr DBMS account and all
+ Answer yes if you want to delete also the Dolibarr MySQL database and all 
+ its datas (datas subjected to this quetion are the Dolibarr DBMS account and all
  Dolibarr tables) ?