diff --git a/build/lemonldap-ng/Makefile b/build/lemonldap-ng/Makefile
index 445914e33..dfe4e6854 100644
--- a/build/lemonldap-ng/Makefile
+++ b/build/lemonldap-ng/Makefile
@@ -1,6 +1,6 @@
 #!/usr/bin/make
 
-VERSION=`head -n1 debian/changelog |sed -e 's/lemonldap-ng (//' -e 's/).*$///'`
+VERSION=`head -n1 debian/changelog |sed -e 's/lemonldap-ng (//' -e 's/).*$$//'`
 HANDLERDIR=lemonldap-ng-handler
 PORTALDIR=lemonldap-ng-portal
 MANAGERDIR=lemonldap-ng-manager
diff --git a/build/lemonldap-ng/debian/changelog b/build/lemonldap-ng/debian/changelog
index 645180bd4..db71c5554 100644
--- a/build/lemonldap-ng/debian/changelog
+++ b/build/lemonldap-ng/debian/changelog
@@ -1,3 +1,10 @@
+lemonldap-ng (0.8.2.2) unstable; urgency=low
+
+  * Debian packages modifications due to Lintian control.
+  * New Debian package: lemonldap-ng-doc
+
+ -- Xavier Guimard <x.guimard@free.fr>  Tue, 15 May 2007 22:38:59 +0200
+
 lemonldap-ng (0.8.2.1) unstable; urgency=low
 
   * More documentation
diff --git a/build/lemonldap-ng/debian/control b/build/lemonldap-ng/debian/control
index 4da9e5c17..7fd2b19c8 100644
--- a/build/lemonldap-ng/debian/control
+++ b/build/lemonldap-ng/debian/control
@@ -14,6 +14,14 @@ Description: Lemonldap::NG Web-SSO system
  .
  This package is a meta package that install handler, manager and portal.
 
+Package: lemonldap-ng-doc
+Architecture: all
+Description: Lemonldap::NG Web-SSO system documentation
+ Lemonldap::NG is a complete Web-SSO system that can run with reverse-proxies
+ or directly on application apache servers.
+ .
+ This package contains html documentation.
+
 Package: liblemonldap-ng-handler-perl
 Architecture: all
 Depends: libapache-session-perl, libwww-perl, libcache-cache-perl, liblemonldap-ng-conf-perl
@@ -21,13 +29,14 @@ Description: Lemonldap::NG apache module part
  Lemonldap::NG is a complete Web-SSO system that can run with reverse-proxies
  or directly on application apache servers.
  .
- This package installs the Apache module part (handler) used to protect web areas.
+ This package installs the Apache module part (handler) used to protect web
+ areas.
 
 Package: liblemonldap-ng-conf-perl
 Architecture: all
-Depends: libdbi-perl
+Depends: libdbi-perl, debconf
 Recommends: libsoap-lite-perl
-Description: Lemonldap::NG apache manager part
+Description: Lemonldap::NG apache administration interface part
  Lemonldap::NG is a complete Web-SSO system that can run with reverse-proxies
  or directly on application apache servers.
  .
diff --git a/build/lemonldap-ng/debian/lemonldap-ng.docs b/build/lemonldap-ng/debian/lemonldap-ng.docs
index 1cd855d36..bac4caa84 100644
--- a/build/lemonldap-ng/debian/lemonldap-ng.docs
+++ b/build/lemonldap-ng/debian/lemonldap-ng.docs
@@ -1,4 +1,2 @@
 debian/README.Debian
-doc/*
 README
-INSTALL
diff --git a/build/lemonldap-ng/debian/liblemonldap-ng-conf-perl.conffiles b/build/lemonldap-ng/debian/liblemonldap-ng-conf-perl.conffiles
deleted file mode 100644
index 1a7ced884..000000000
--- a/build/lemonldap-ng/debian/liblemonldap-ng-conf-perl.conffiles
+++ /dev/null
@@ -1 +0,0 @@
-/etc/lemonldap-ng/storage.conf
diff --git a/build/lemonldap-ng/debian/liblemonldap-ng-conf-perl.config b/build/lemonldap-ng/debian/liblemonldap-ng-conf-perl.config
index 66f806920..a2a06fe88 100644
--- a/build/lemonldap-ng/debian/liblemonldap-ng-conf-perl.config
+++ b/build/lemonldap-ng/debian/liblemonldap-ng-conf-perl.config
@@ -19,7 +19,7 @@ db_input medium liblemonldap-ng-conf-perl/managerPassword || true
 
 db_input medium liblemonldap-ng-conf-perl/portal || true
 
-db_input medium liblemonldap-ng-conf-perl/howto || true
+db_input high liblemonldap-ng-conf-perl/howto || true
 
 db_go || true
 
diff --git a/build/lemonldap-ng/debian/liblemonldap-ng-conf-perl.docs b/build/lemonldap-ng/debian/liblemonldap-ng-conf-perl.docs
index cfdc3012c..bac4caa84 100644
--- a/build/lemonldap-ng/debian/liblemonldap-ng-conf-perl.docs
+++ b/build/lemonldap-ng/debian/liblemonldap-ng-conf-perl.docs
@@ -1,2 +1,2 @@
 debian/README.Debian
-
+README
diff --git a/build/lemonldap-ng/debian/liblemonldap-ng-conf-perl.templates b/build/lemonldap-ng/debian/liblemonldap-ng-conf-perl.templates
index f2d902489..19c2ed1c2 100644
--- a/build/lemonldap-ng/debian/liblemonldap-ng-conf-perl.templates
+++ b/build/lemonldap-ng/debian/liblemonldap-ng-conf-perl.templates
@@ -12,11 +12,11 @@ Description-fr: Changements dans lemonldap::NG
 Template: liblemonldap-ng-conf-perl/ldapServer
 Type: string
 Default: localhost
-Description: LDAP server
+Description: LDAP server:
  Set here name or IP address of the LDAP server that has to be used by
  Lemonldap::NG.
  You can modify this value later using the Lemonldap::NG manager.
-Description-fr: Serveur LDAP
+Description-fr: Serveur LDAP:
  Indiquez ici le nom ou l'adresse IP du serveur LDAP que Lemonldap::NG utilisera.
  Vous pourrez modifier cette valeur ultérieurement dans le gestionnaire
  Lemonldap::NG.
@@ -24,10 +24,10 @@ Description-fr: Serveur LDAP
 Template: liblemonldap-ng-conf-perl/domain
 Type: string
 Default: example.com
-Description: Lemonldap::NG DNS domain
+Description: Lemonldap::NG DNS domain:
  Set here the main domain protected by Lemonldap::NG.
  You can modify this value later using the Lemonldap::NG manager.
-Description-fr: Domaine DNS de Lemonldap::NG
+Description-fr: Domaine DNS de Lemonldap::NG:
  Indiquez ici le domaine principal protégé par lemonldap::NG.
  Vous pourrez modifier cette valeur ultérieurement dans le gestionnaire
  Lemonldap::NG.
@@ -35,10 +35,10 @@ Description-fr: Domaine DNS de Lemonldap::NG
 Template: liblemonldap-ng-conf-perl/portal
 Type: string
 Default: http://auth.example.com/
-Description: Lemonldap::NG portal
+Description: Lemonldap::NG portal:
  Set here the Lemonldap::NG portal URL.
  You can modify this value later using the Lemonldap::NG manager.
-Description-fr: Portail Lemonldap::NG
+Description-fr: Portail Lemonldap::NG:
  Indiquez ici l'URL du portail Lemonldap::NG.
  Vous pourrez modifier cette valeur ultérieurement dans le gestionnaire
  Lemonldap::NG.
@@ -46,10 +46,10 @@ Description-fr: Portail Lemonldap::NG
 Template: liblemonldap-ng-conf-perl/ldapPort
 Type: string
 Default: 389
-Description: LDAP server port
+Description: LDAP server port:
  Set here the port used by the LDAP server.
  You can modify this value later using the Lemonldap::NG manager.
-Description-fr: Port du serveur LDAP
+Description-fr: Port du serveur LDAP:
  Indiquez ici le numéro du port du serveur LDAP.
  Vous pourrez modifier cette valeur ultérieurement dans le gestionnaire
  Lemonldap::NG.
@@ -57,21 +57,21 @@ Description-fr: Port du serveur LDAP
 Template: liblemonldap-ng-conf-perl/ldapBase
 Type: string
 Default: dc=example,dc=com
-Description: LDAP search base
+Description: LDAP search base:
  Set here the search base to use in LDAP queries.
  You can modify this value later using the Lemonldap::NG manager.
-Description-fr: Base de recherche LDAP
+Description-fr: Base de recherche LDAP:
  Indiquez ici la base de recherche des requêtes LDAP.
  Vous pourrez modifier cette valeur ultérieurement dans le gestionnaire
  Lemonldap::NG.
 
 Template: liblemonldap-ng-conf-perl/managerDn
 Type: string
-Description: LDAP account
+Description: LDAP account:
  Set here the account that Lemonldap::NG has to use for its LDAP requests.
  Leaving it blank causes Lemonldap::NG to use anonymous connections.
  You can modify this value later using the Lemonldap::NG manager.
-Description-fr: Compte LDAP
+Description-fr: Compte LDAP:
  Indiquez ici le compte que Lemonldap::NG doit utiliser pour ses requêtes
  LDAP. Laissez le champ vide pour utiliser des connexions anonymes.
  Vous pourrez modifier cette valeur ultérieurement dans le gestionnaire
@@ -79,10 +79,10 @@ Description-fr: Compte LDAP
 
 Template: liblemonldap-ng-conf-perl/managerPassword
 Type: string
-Description: LDAP password
+Description: LDAP password:
  Set here the password for the Lemonldap::NG LDAP account.
  You can modify this value later using the Lemonldap::NG manager.
-Description-fr: Mot de passe LDAP
+Description-fr: Mot de passe LDAP:
  Indiquez ici le mot de passe du compte LDAP de Lemonldap::NG.
  Vous pourrez modifier cette valeur ultérieurement dans le gestionnaire
  Lemonldap::NG.
diff --git a/build/lemonldap-ng/debian/liblemonldap-ng-handler-perl.docs b/build/lemonldap-ng/debian/liblemonldap-ng-handler-perl.docs
index cfdc3012c..bac4caa84 100644
--- a/build/lemonldap-ng/debian/liblemonldap-ng-handler-perl.docs
+++ b/build/lemonldap-ng/debian/liblemonldap-ng-handler-perl.docs
@@ -1,2 +1,2 @@
 debian/README.Debian
-
+README
diff --git a/build/lemonldap-ng/debian/liblemonldap-ng-manager-perl.conffiles b/build/lemonldap-ng/debian/liblemonldap-ng-manager-perl.conffiles
deleted file mode 100644
index 85a898541..000000000
--- a/build/lemonldap-ng/debian/liblemonldap-ng-manager-perl.conffiles
+++ /dev/null
@@ -1,3 +0,0 @@
-/etc/lemonldap-ng/apply.conf
-/etc/lemonldap-ng/manager-apache.conf
-/etc/lemonldap-ng/manager-apache2.conf
diff --git a/build/lemonldap-ng/debian/liblemonldap-ng-manager-perl.docs b/build/lemonldap-ng/debian/liblemonldap-ng-manager-perl.docs
index cfdc3012c..bac4caa84 100644
--- a/build/lemonldap-ng/debian/liblemonldap-ng-manager-perl.docs
+++ b/build/lemonldap-ng/debian/liblemonldap-ng-manager-perl.docs
@@ -1,2 +1,2 @@
 debian/README.Debian
-
+README
diff --git a/build/lemonldap-ng/debian/liblemonldap-ng-portal-perl.conffiles b/build/lemonldap-ng/debian/liblemonldap-ng-portal-perl.conffiles
deleted file mode 100644
index bed9c06ad..000000000
--- a/build/lemonldap-ng/debian/liblemonldap-ng-portal-perl.conffiles
+++ /dev/null
@@ -1,2 +0,0 @@
-/etc/lemonldap-ng/portal-apache.conf
-/etc/lemonldap-ng/portal-apache2.conf
diff --git a/build/lemonldap-ng/debian/liblemonldap-ng-portal-perl.docs b/build/lemonldap-ng/debian/liblemonldap-ng-portal-perl.docs
index cfdc3012c..bac4caa84 100644
--- a/build/lemonldap-ng/debian/liblemonldap-ng-portal-perl.docs
+++ b/build/lemonldap-ng/debian/liblemonldap-ng-portal-perl.docs
@@ -1,2 +1,2 @@
 debian/README.Debian
-
+README
diff --git a/modules/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/CGI.pm b/modules/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/CGI.pm
index 7d2fb7dab..a6bb37375 100644
--- a/modules/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/CGI.pm
+++ b/modules/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/CGI.pm
@@ -108,6 +108,7 @@ sub grant {
 
 1;
 __END__
+
 =head1 NAME
 
 Lemonldap::NG::Handler::CGI - Perl extension for using Lemonldap::NG
diff --git a/modules/lemonldap-ng-manager/scripts/lmConfig_File2MySQL b/modules/lemonldap-ng-manager/scripts/lmConfig_File2MySQL
index 6ce574231..c62fbc2e2 100755
--- a/modules/lemonldap-ng-manager/scripts/lmConfig_File2MySQL
+++ b/modules/lemonldap-ng-manager/scripts/lmConfig_File2MySQL
@@ -66,6 +66,7 @@ Options:
 }
 1;
 __END__
+
 =head1 NAME
 
 lmConfig_File2MySQL - Perl utility to convert Lemonldap::NG configuration file