diff --git a/ChangeLog b/ChangeLog
index acee06ea5..e1dc42a6c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2012-06-01  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* SoObjects/SOGo/NSString+Crypto.m
+	(-isEqualToCrypted:withDefaultScheme:): invoke "intValue" rather
+	than "integerValue" on the encoding number as the int type is not
+	crucial and it breaks the build with old versions of GNUstep.
+
+	* SoObjects/SOGo/NSString+Crypto.[hm]: new module that provides
+	category methods for returning encrypted passwords strings and
+	their encryption algorithm.
+
 2012-05-31  Ludovic Marcotte  <lmarcotte@inverse.ca>
 
 	* SoObjects/SOGo/SOGoGroup.m - we now handle lowercase
diff --git a/SoObjects/SOGo/NSString+Crypto.m b/SoObjects/SOGo/NSString+Crypto.m
index 566075164..f3370b8b5 100644
--- a/SoObjects/SOGo/NSString+Crypto.m
+++ b/SoObjects/SOGo/NSString+Crypto.m
@@ -142,7 +142,7 @@
   scheme   = [passInfo objectAtIndex: 0];
   pass     = [passInfo objectAtIndex: 1];
   encodingNumber = [passInfo objectAtIndex: 2];
-  encoding = [encodingNumber integerValue];
+  encoding = [encodingNumber intValue];
 
   if (encoding == encHex)
     {