diff --git a/ChangeLog b/ChangeLog
index 42c5ca3c..d63ebd8f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-17  Nicolas François  <nicolas.francois@centraliens.net>
+
+	* NEWS, src/usermod.c: Update the group database before flushing
+	the nscd caches.
+
 2007-11-17  Nicolas François  <nicolas.francois@centraliens.net>
 
 	* NEWS, src/userdel.c: Abort if an error is found while updating the
diff --git a/NEWS b/NEWS
index 052d3536..4fabd128 100644
--- a/NEWS
+++ b/NEWS
@@ -27,6 +27,7 @@ shadow-4.0.18.1 -> shadow-4.0.18.2					UNRELEASED
   (https://bugzilla.redhat.com/show_bug.cgi?id=240915)
 - userdel: Abort if an error is detected while updating the passwd or group
   databases. The passwd or group files will not be written.
+- usermod: Update the group database before flushing the nscd caches.
 
 shadow-4.0.18.1 -> shadow-4.0.18.2					28-10-2007
 
diff --git a/src/usermod.c b/src/usermod.c
index 13759e8d..c67ad599 100644
--- a/src/usermod.c
+++ b/src/usermod.c
@@ -1529,12 +1529,12 @@ int main (int argc, char **argv)
 	usr_update ();
 	close_files ();
 
-	nscd_flush_cache ("passwd");
-	nscd_flush_cache ("group");
-
 	if (Gflg || lflg)
 		grp_err = grp_update ();
 
+	nscd_flush_cache ("passwd");
+	nscd_flush_cache ("group");
+
 	if (mflg)
 		move_home ();