diff --git a/build/lemonldap-ng/Makefile b/build/lemonldap-ng/Makefile
index 60ee3858f..27781d8ed 100644
--- a/build/lemonldap-ng/Makefile
+++ b/build/lemonldap-ng/Makefile
@@ -203,6 +203,7 @@ install_bin:	install_libs install_conf_dir
 		${SRCPORTALDIR}/example/scripts/purgeCentralCache \
 		${SRCPORTALDIR}/example/scripts/buildPortalWSDL \
 		${SRCCOMMONDIR}/scripts/convertConfig \
+		${SRCCOMMONDIR}/scripts/lmMigrateConfFiles2ini \
 		${SRCMANAGERDIR}/example/scripts/lmConfigEditor \
 			$(RBINDIR)
 	chmod +x $(RBINDIR)/*
diff --git a/build/lemonldap-ng/debian/changelog b/build/lemonldap-ng/debian/changelog
index 1e3b541d8..c608ae489 100644
--- a/build/lemonldap-ng/debian/changelog
+++ b/build/lemonldap-ng/debian/changelog
@@ -2,4 +2,4 @@ lemonldap-ng (0.9.5-0) unstable; urgency=low
 
   * Local build
 
- -- Xavier Guimard <x.guimard@free.fr>  Wed, 12 Aug 2009 11:08:42 +0200
+ -- Xavier Guimard <x.guimard@free.fr>  Wed, 16 Dec 2009 21:42:58 +0100
diff --git a/build/lemonldap-ng/debian/liblemonldap-ng-conf-perl.install b/build/lemonldap-ng/debian/liblemonldap-ng-conf-perl.install
index ad1d44217..13c1e1e25 100644
--- a/build/lemonldap-ng/debian/liblemonldap-ng-conf-perl.install
+++ b/build/lemonldap-ng/debian/liblemonldap-ng-conf-perl.install
@@ -4,4 +4,5 @@ debian/tmp/usr/share/perl5/Lemonldap/NG/Common*
 debian/tmp/usr/share/man/man3/Lemonldap::NG::Common*
 debian/tmp/usr/share/lemonldap-ng/ressources
 debian/tmp/usr/share/lemonldap-ng/bin/convertConfig
+debian/tmp/usr/share/lemonldap-ng/bin/lmMigrateConfFiles2ini
 debian/tmp/var/lib/lemonldap-ng/conf/
diff --git a/modules/lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/LDAP.pm b/modules/lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/LDAP.pm
index b7ce88ed3..53a2da8e3 100644
--- a/modules/lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/LDAP.pm
+++ b/modules/lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/LDAP.pm
@@ -14,7 +14,6 @@ our $VERSION = 0.02;
 
 BEGIN {
     *Lemonldap::NG::Common::Conf::ldap     = \&ldap;
-    *Lemonldap::NG::Common::Conf::logError = \&logError;
 }
 
 sub prereq {
diff --git a/modules/lemonldap-ng-manager/example/skins/default/jquery-ui-1.7.2.custom.css b/modules/lemonldap-ng-manager/example/skins/default/jquery-ui-1.7.2.custom.css
index 9d7aa08be..232aa4d82 100644
--- a/modules/lemonldap-ng-manager/example/skins/default/jquery-ui-1.7.2.custom.css
+++ b/modules/lemonldap-ng-manager/example/skins/default/jquery-ui-1.7.2.custom.css
@@ -50,9 +50,9 @@
 ----------------------------------*/
 .ui-widget { font-family: Trebuchet MS, Tahoma, Verdana, Arial, sans-serif; font-size: 1.1em; }
 .ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Trebuchet MS, Tahoma, Verdana, Arial, sans-serif; font-size: 1em; }
-.ui-widget-content { border: 1px solid #dddddd; background: #eeeeee url(images/ui-bg_highlight-soft_100_eeeeee_1x100.png) 50% top repeat-x; color: #333333; }
+.ui-widget-content { border: 1px solid #dddddd; background: #eeeeee url(/images/ui-bg_highlight-soft_100_eeeeee_1x100.png) 50% top repeat-x; color: #333333; }
 .ui-widget-content a { color: #333333; }
-.ui-widget-header { border: 1px solid #e78f08; background: #f6a828 url(images/ui-bg_gloss-wave_35_f6a828_500x100.png) 50% 50% repeat-x; color: #ffffff; font-weight: bold; }
+.ui-widget-header { border: 1px solid #e78f08; background: #f6a828 url(/images/ui-bg_gloss-wave_35_f6a828_500x100.png) 50% 50% repeat-x; color: #ffffff; font-weight: bold; }
 .ui-widget-header a { color: #ffffff; }
 
 /* Interaction states
diff --git a/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Uploader.pm b/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Uploader.pm
index d1ce0cd5e..744d35697 100644
--- a/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Uploader.pm
+++ b/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Uploader.pm
@@ -168,6 +168,7 @@ sub findAllConfKeys {
             push @res, ( $m =~ /^(?:.*?:)?(.*?)(?:\:.*)?$/ ? $1 : () );
         }
     }
+    push @res, @{$h->{_upload}} if($h->{_upload});
     return @res;
 }
 
diff --git a/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_Struct.pm b/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_Struct.pm
index 04bd48a6c..86d388011 100644
--- a/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_Struct.pm
+++ b/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_Struct.pm
@@ -125,7 +125,7 @@ sub struct {
         groups =>
           { _nodes => ['hash:/groups:groups:btext'], _js => 'hashRoot' },
         virtualHosts =>
-          { _nodes => ['nhash:/locationRules:virtualHosts:none'], },
+          { _nodes => ['nhash:/locationRules:virtualHosts:none'], _upload => ['/exportedHeaders'] },
     };
 }