diff --git a/ChangeLog b/ChangeLog
index ca3d4c25c9..5d6658ad51 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2011-07-22  Ulrich Drepper  <drepper@gmail.com>
 
+	* crypt/crypt_util.c (__init_des_r): Optimize memset calls.
+
 	* crypt/crypt_util.c (__init_des_r): Add read barrier as well.
 
 2011-07-21  Andreas Schwab  <schwab@redhat.com>
diff --git a/crypt/crypt_util.c b/crypt/crypt_util.c
index 2576ccbce5..04b262d9c8 100644
--- a/crypt/crypt_util.c
+++ b/crypt/crypt_util.c
@@ -492,10 +492,20 @@ small_tables_done:
    *
    */
 
-  _ufc_clearmem((char*)__data->sb0, (int)sizeof(__data->sb0));
-  _ufc_clearmem((char*)__data->sb1, (int)sizeof(__data->sb1));
-  _ufc_clearmem((char*)__data->sb2, (int)sizeof(__data->sb2));
-  _ufc_clearmem((char*)__data->sb3, (int)sizeof(__data->sb3));
+  if (__data->sb0 + sizeof (__data->sb0) == __data->sb1
+      && __data->sb1 + sizeof (__data->sb1) == __data->sb2
+      && __data->sb2 + sizeof (__data->sb2) == __data->sb3)
+    _ufc_clearmem(__data->sb0,
+		  (int)sizeof(__data->sb0)
+		  + (int)sizeof(__data->sb1)
+		  + (int)sizeof(__data->sb2)
+		  + (int)sizeof(__data->sb3));
+  else {
+    _ufc_clearmem(__data->sb0, (int)sizeof(__data->sb0));
+    _ufc_clearmem(__data->sb1, (int)sizeof(__data->sb1));
+    _ufc_clearmem(__data->sb2, (int)sizeof(__data->sb2));
+    _ufc_clearmem(__data->sb3, (int)sizeof(__data->sb3));
+  }
 
   for(sg = 0; sg < 4; sg++) {
     int j1, j2;