diff --git a/ChangeLog b/ChangeLog
index 269d311c0b..fd4836a02a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-06-06  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
+
+	* stdlib/longlong.h: Update from GCC.  Fix smul_ppmm for S/390.
+
 2011-06-06  Roland McGrath  <roland@hack.frob.com>
 
 	[BZ #12849]
diff --git a/stdlib/longlong.h b/stdlib/longlong.h
index 5937a48554..1bab76db33 100644
--- a/stdlib/longlong.h
+++ b/stdlib/longlong.h
@@ -349,7 +349,7 @@ UDItype __umulsidi3 (USItype, USItype);
     __asm__ ("mr\t%%r0,%3"                                              \
              : "=r" (r0), "=r" (r1)                                     \
              : "r"  (r1),  "r" (m1));                                   \
-    (xh) = r1; (xl) = r0;                                               \
+    (xh) = r0; (xl) = r1;                                               \
   } while (0)
 #define sdiv_qrnnd(q, r, n1, n0, d) \
   do {									\