diff --git a/modules/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/SharedConf.pm b/modules/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/SharedConf.pm
index a5421f42d..c0ab3361b 100644
--- a/modules/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/SharedConf.pm
+++ b/modules/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/SharedConf.pm
@@ -116,6 +116,7 @@ sub setConf {
     $cfgNum++;
     $args->{_n_conf} = $cfgNum;
     $refLocalStorage->set( "conf", $args, $EXPIRES_NEVER );
+    $class->lmLog( "$class: store configuration " . $args->{cfgNum}, 'debug' );
     $class->globalInit($args);
 }
 
@@ -126,6 +127,7 @@ sub getConf {
         $class->lmLog( "$class: Unable to load configuration", 'error' );
         return SERVER_ERROR;
     }
+    $class->lmLog( "$class: get configuration " . $tmp->{cfgNum}, 'debug' );
     return $tmp;
 }
 
@@ -134,6 +136,7 @@ sub refresh($$) {
     $class->lmLog( "$class: request for configuration reload", 'info' );
     $r->handler("perl-script");
     if ( $class->globalConfUpdate($r) == OK ) {
+        # $r->push_handlers( PerlHandler => sub { $r = shift; $r->send_http_headers; $r->print("OK"); OK } );
         $r->push_handlers( PerlHandler => sub { OK } );
     }
     else {
diff --git a/modules/lemonldap-ng-manager/Changes b/modules/lemonldap-ng-manager/Changes
index 467607433..ef530d9a7 100644
--- a/modules/lemonldap-ng-manager/Changes
+++ b/modules/lemonldap-ng-manager/Changes
@@ -1,5 +1,9 @@
 Revision history for Perl extension Lemonldap::NG::Manager.
 
+0.511 Sun Mar 11 8:24:32
+	- Bug correction: lock does not work with File.pm
+	  (Closes: #306760 / forge.objectweb.org)
+
 0.51  Fri Mar 9 7:16:42
 	- Bug corrections issued from test in real life.
 	- More help in english
diff --git a/modules/lemonldap-ng-manager/MANIFEST b/modules/lemonldap-ng-manager/MANIFEST
index 4c14832ea..5c077e628 100644
--- a/modules/lemonldap-ng-manager/MANIFEST
+++ b/modules/lemonldap-ng-manager/MANIFEST
@@ -1,4 +1,5 @@
 Changes
+example/apply.conf
 example/imgs/_customers.gif
 example/imgs/blank.gif
 example/imgs/book.gif
diff --git a/modules/lemonldap-ng-manager/example/index.pl b/modules/lemonldap-ng-manager/example/index.pl
index e009106da..d017ff954 100644
--- a/modules/lemonldap-ng-manager/example/index.pl
+++ b/modules/lemonldap-ng-manager/example/index.pl
@@ -9,6 +9,7 @@ my $h = new Lemonldap::NG::Manager(
             dirName => "__DIR__/conf/",
         },
         dhtmlXTreeImageLocation => "/imgs/",
+	applyConfFile           => '__DIR__/manager/apply.conf',
 
         # jsFile => /path/to/lemonldap-ng-manager.js,
     }
diff --git a/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager.pm b/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager.pm
index a6b6ef978..dcad2a92d 100644
--- a/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager.pm
+++ b/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager.pm
@@ -13,7 +13,7 @@ use LWP::UserAgent;
 
 our @ISA = qw(Lemonldap::NG::Manager::Base);
 
-our $VERSION = '0.51';
+our $VERSION = '0.511';
 
 sub new {
     my ( $class, $args ) = @_;
diff --git a/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/File.pm b/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/File.pm
index de846f1b7..fc733b8f1 100644
--- a/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/File.pm
+++ b/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/File.pm
@@ -3,7 +3,7 @@ package Lemonldap::NG::Manager::Conf::File;
 use strict;
 use Lemonldap::NG::Manager::Conf::Constants;
 
-our $VERSION = 0.2;
+our $VERSION = 0.21;
 
 sub prereq {
     my $self = shift;
@@ -41,8 +41,8 @@ sub lock {
         sleep 2;
         return 0 if( $self->isLocked );
     }
-    unless( open F, $self->{dirName} . "/lmConf.lock" ) {
-        print STDERR "Unable to lock\n";
+    unless( open F, ">".$self->{dirName} . "/lmConf.lock" ) {
+        print STDERR "Unable to lock (".$self->{dirName}."/lmConf.lock)\n";
         return 0;
     }
     print F $$;
diff --git a/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Help.pm b/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Help.pm
index f29c52fdc..2064cbe44 100644
--- a/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Help.pm
+++ b/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Help.pm
@@ -91,7 +91,7 @@ d&eacute;but ou fin de mot).</p>
 
 <p>La variable export&eacute;e \$groups est une cha&icirc;ne de caract&egrave;res compos&eacute;s de tous les
 noms de groupes auquel l'utilisateur connect&eacute; appartient (c'est &agrave; dire les
-noms de groupe pour lesquels l'expression est vraie.</p>
+noms de groupe pour lesquels l'expression est vraie).</p>
 EOT
 }
 
diff --git a/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_HTML.pm b/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_HTML.pm
index be00c3ab1..53420e463 100644
--- a/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_HTML.pm
+++ b/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_HTML.pm
@@ -183,7 +183,7 @@ function onNodeSelect(nodeId) {
     }
   }
   if(tree.getUserData(nodeId,"modif")=='both') but+=button('$text{deleteNode}','deleteNode',nodeId);
-    but+=button('$text{saveConf}','saveConf',nodeId);
+  but+=button('$text{saveConf}','saveConf',nodeId);
   if(nodeId == 'root') but+=button('$text{prevConf}','prevConf',nodeId)
                            +button('$text{nextConf}','nextConf',nodeId)
                            +button('$text{lastConf}','lastConf',nodeId);
diff --git a/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_i18n.pm b/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_i18n.pm
index e7831859a..06f48a5b5 100644
--- a/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_i18n.pm
+++ b/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_i18n.pm
@@ -80,7 +80,7 @@ sub fr {
         invalidLine             => 'Ligne invalide',
         error                   => 'Erreur',
         result                  => 'R&eacute;sultat',
-        changesAppliedLater     => "Changements seront actif d'ici 10 minutes'",
+        changesAppliedLater     => "Les changements seront effectifs d'ici 10 minutes",
         prevConf                => 'Pr&eacute;c&eacute;dente',
         nextConf                => 'Suivante',
         lastConf                => 'Derni&egrave;re',