diff --git a/ChangeLog b/ChangeLog
index 3bc1ba973b..5c784fcb50 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-07-15  Stefan Liebler  <stli@linux.vnet.ibm.com>
+
+	* sysdeps/s390/fpu/libm-test-ulps: Regenerated.
+
 2015-07-14  Roland McGrath  <roland@hack.frob.com>
 
 	* sysdeps/generic/dl-fileid.h: New file.
diff --git a/sysdeps/s390/fpu/libm-test-ulps b/sysdeps/s390/fpu/libm-test-ulps
index b7a1c893ca..232730b8c3 100644
--- a/sysdeps/s390/fpu/libm-test-ulps
+++ b/sysdeps/s390/fpu/libm-test-ulps
@@ -1133,11 +1133,11 @@ ldouble: 2
 
 Function: Imaginary part of "csin_downward":
 double: 1
-float: 2
+float: 1
 idouble: 1
-ifloat: 2
-ildouble: 3
-ldouble: 3
+ifloat: 1
+ildouble: 2
+ldouble: 2
 
 Function: Real part of "csin_towardzero":
 double: 2
@@ -1148,26 +1148,26 @@ ildouble: 2
 ldouble: 2
 
 Function: Imaginary part of "csin_towardzero":
+double: 1
+float: 1
+idouble: 1
+ifloat: 1
+ildouble: 2
+ldouble: 2
+
+Function: Real part of "csin_upward":
 double: 2
 float: 2
 idouble: 2
 ifloat: 2
-ildouble: 3
-ldouble: 3
-
-Function: Real part of "csin_upward":
-double: 2
-float: 3
-idouble: 2
-ifloat: 3
 ildouble: 2
 ldouble: 2
 
 Function: Imaginary part of "csin_upward":
 double: 1
-float: 3
+float: 2
 idouble: 1
-ifloat: 3
+ifloat: 2
 ildouble: 3
 ldouble: 3
 
@@ -1190,8 +1190,8 @@ double: 2
 float: 2
 idouble: 2
 ifloat: 2
-ildouble: 3
-ldouble: 3
+ildouble: 2
+ldouble: 2
 
 Function: Imaginary part of "csinh_downward":
 double: 2
@@ -1206,30 +1206,30 @@ double: 2
 float: 2
 idouble: 2
 ifloat: 2
-ildouble: 3
-ldouble: 3
+ildouble: 2
+ldouble: 2
 
 Function: Imaginary part of "csinh_towardzero":
 double: 2
 float: 3
 idouble: 2
 ifloat: 3
-ildouble: 3
-ldouble: 3
+ildouble: 2
+ldouble: 2
 
 Function: Real part of "csinh_upward":
 double: 1
-float: 3
+float: 2
 idouble: 1
-ifloat: 3
+ifloat: 2
 ildouble: 3
 ldouble: 3
 
 Function: Imaginary part of "csinh_upward":
 double: 2
-float: 3
+float: 2
 idouble: 2
-ifloat: 3
+ifloat: 2
 ildouble: 2
 ldouble: 2
 
@@ -2108,10 +2108,10 @@ ildouble: 3
 ldouble: 3
 
 Function: "tgamma":
-double: 7
-float: 4
-idouble: 7
-ifloat: 4
+double: 3
+float: 3
+idouble: 3
+ifloat: 3
 ildouble: 4
 ldouble: 4