diff --git a/build/lemonldap-ng/TODO b/build/lemonldap-ng/TODO
index b2d7d1fb1..1a36117c0 100644
--- a/build/lemonldap-ng/TODO
+++ b/build/lemonldap-ng/TODO
@@ -22,3 +22,4 @@ Order rules :
 Documentation :
  * Security document
  * apply.conf Howto
+ * ldapGroupBase
diff --git a/build/lemonldap-ng/changelog b/build/lemonldap-ng/changelog
index 3d60d8c2c..bf85c5eed 100644
--- a/build/lemonldap-ng/changelog
+++ b/build/lemonldap-ng/changelog
@@ -4,6 +4,12 @@ lemonldap-ng (0.9) unstable; urgency=low
 
  -- Xavier Guimard <x.guimard@free.fr>  Sun, 14 Oct 2007 12:02:33 +0200
 
+lemonldap-ng (0.8.3.1) unstable; urgency=low
+
+  * New feature: LDAP groups are now available in $groups
+
+ -- Xavier Guimard <x.guimard@free.fr>  Wed, 07 Nov 2007 16:41:07 +0100
+
 lemonldap-ng (0.8.3) unstable; urgency=high
 
   * Syntax errors in configuration are now displayed
diff --git a/build/lemonldap-ng/debian/copyright b/build/lemonldap-ng/debian/copyright
index e354baabf..4933d5ff0 100644
--- a/build/lemonldap-ng/debian/copyright
+++ b/build/lemonldap-ng/debian/copyright
@@ -1,9 +1,11 @@
 This package was debianized by Xavier Guimard <x.guimard@free.fr> on
 Sun, 17 Dec 2006 17:46:47 +0100.
 
+It was downloaded from: http://forge.objectweb.org/project/showfiles.php?group_id=274
+
 Copyright:
 
-Copyright 2004, 2005, 2006 by Xavier Guimard
+Copyright 2004, 2005, 2006, 2007 by Xavier Guimard
 
 Licence:
 Lemonldap::NG is distributed under your choice under the GNU General Public
diff --git a/modules/lemonldap-ng-portal/Changes b/modules/lemonldap-ng-portal/Changes
index 0a4752d46..1776de477 100644
--- a/modules/lemonldap-ng-portal/Changes
+++ b/modules/lemonldap-ng-portal/Changes
@@ -1,5 +1,8 @@
 Revision history for Perl extension Lemonldap::NG::Portal.
 
+0.8.1 Wed Nov 7 16:44:46 2007
+	- Ldap groups can now be available in $groups
+
 0.8   Mon Oct 15 7:58:25 2007
 	- Integration of the Liberty Alliance module issued from FederID project
 
diff --git a/modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/SharedConf.pm b/modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/SharedConf.pm
index a489c4520..af2d0aa72 100644
--- a/modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/SharedConf.pm
+++ b/modules/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/SharedConf.pm
@@ -86,6 +86,19 @@ sub setGroups {
             $groups .= "$_ ";
         }
     }
+    if ( $self->{ldapGroupBase} ) {
+        my $mesg = $self->{ldap}->search(
+            base   => $self->{ldapGroupBase},
+            filter => "(|(member=" . $self->{dn} . ")(uniqueMember=" . $self->{dn} . "))",
+            attrs  => ["cn"],
+        );
+        if ( $mesg->code() == 0 ) {
+            foreach my $entry ($mesg->all_entries) {
+                my @values = $entry->get_value("cn");
+                $groups .= $values[0] . " ";
+            }
+        }
+    }
     $self->{sessionInfo}->{groups} = $groups;
     PE_OK;
 }