diff --git a/ChangeLog b/ChangeLog
index 510b855e5..18610def4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2009-03-17  Ludovic Marcotte <lmarcotte@inverse.ca>
+
+	* Documentation/SOGo Installation Guide.odt
+	Updated to mention MySQL and to refer as 1.0
+	as the version number
+	* Scripts/sogo-init.d-debian and
+	Scripts/sogo-init.d-redhat
+	We now kill gdnc (only processes belonging to
+	the sogo user) when stopping sogod.
+
 2009-03-16  Ludovic Marcotte <lmarcotte@inverse.ca>
 
         * SoObjects/SOGo/LDAPSource.m: We now support
diff --git a/Documentation/SOGo Installation Guide.odt b/Documentation/SOGo Installation Guide.odt
index e7174aa70..4b4f46a03 100644
Binary files a/Documentation/SOGo Installation Guide.odt and b/Documentation/SOGo Installation Guide.odt differ
diff --git a/Scripts/sogo-init.d-debian b/Scripts/sogo-init.d-debian
index 90ce79c36..8c7d354ca 100755
--- a/Scripts/sogo-init.d-debian
+++ b/Scripts/sogo-init.d-debian
@@ -71,6 +71,7 @@ case "$1" in
 	;;
   stop)
 	echo "Stopping $DESC: "
+	/usr/bin/killall -u sogo gdnc
 	for ((a=1; a <= PREFORK ; a++))
 	do
 	  pid=$(cat $PIDFILE$a)
diff --git a/Scripts/sogo-init.d-redhat b/Scripts/sogo-init.d-redhat
index 0c0813ea8..ff9e37535 100755
--- a/Scripts/sogo-init.d-redhat
+++ b/Scripts/sogo-init.d-redhat
@@ -86,6 +86,7 @@ start() {
 
 stop() {
     echo $"Stopping $DESC: "
+    /usr/bin/killall -u sogo gdnc
     for ((a=1; a <= PREFORK ; a++))
     do
         pid="`cat ${PIDFILE}${a}`"