diff --git a/ChangeLog b/ChangeLog
index d3b180fa01..e5d46bcf3b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2016-01-19  Joseph Myers  <joseph@codesourcery.com>
+
+	* math/gen-libm-test.pl (parse_ulps): Do not reduce
+	already-recorded ulps.
+	* sysdeps/arm/libm-test-ulps: Regenerated.
+	* sysdeps/mips/mips32/libm-test-ulps: Likewise.
+	* sysdeps/mips/mips64/libm-test-ulps: Likewise.
+	* sysdeps/powerpc/nofpu/libm-test-ulps: Likewise.
+
 2016-01-19  Andrew Senkevich  <andrew.senkevich@intel.com>
 	    Paul Pluzhnikov  <ppluzhnikov@google.com>
 
diff --git a/math/gen-libm-test.pl b/math/gen-libm-test.pl
index eb1c29956d..17f17f7493 100755
--- a/math/gen-libm-test.pl
+++ b/math/gen-libm-test.pl
@@ -583,8 +583,11 @@ sub parse_ulps {
 	# ignore
 	next;
       } else {
-	$results{$test}{$type}{'ulp'}{$float} = $eps;
-	$results{$test}{'has_ulps'} = 1;
+	if (!defined ($results{$test}{$type}{'ulp'}{$float})
+	    || $results{$test}{$type}{'ulp'}{$float} < $eps) {
+	  $results{$test}{$type}{'ulp'}{$float} = $eps;
+	  $results{$test}{'has_ulps'} = 1;
+	}
       }
       if ($type =~ /^real|imag$/) {
 	$results{$test}{'type'} = 'complex';
diff --git a/sysdeps/arm/libm-test-ulps b/sysdeps/arm/libm-test-ulps
index 219ba3cfbe..aa3d696863 100644
--- a/sysdeps/arm/libm-test-ulps
+++ b/sysdeps/arm/libm-test-ulps
@@ -115,7 +115,7 @@ ifloat: 2
 
 Function: "atan2_upward":
 double: 1
-float: 1
+float: 2
 idouble: 1
 ifloat: 2
 
@@ -291,7 +291,7 @@ ifloat: 2
 
 Function: "carg_upward":
 double: 1
-float: 1
+float: 2
 idouble: 1
 ifloat: 2
 
diff --git a/sysdeps/mips/mips32/libm-test-ulps b/sysdeps/mips/mips32/libm-test-ulps
index 219ba3cfbe..aa3d696863 100644
--- a/sysdeps/mips/mips32/libm-test-ulps
+++ b/sysdeps/mips/mips32/libm-test-ulps
@@ -115,7 +115,7 @@ ifloat: 2
 
 Function: "atan2_upward":
 double: 1
-float: 1
+float: 2
 idouble: 1
 ifloat: 2
 
@@ -291,7 +291,7 @@ ifloat: 2
 
 Function: "carg_upward":
 double: 1
-float: 1
+float: 2
 idouble: 1
 ifloat: 2
 
diff --git a/sysdeps/mips/mips64/libm-test-ulps b/sysdeps/mips/mips64/libm-test-ulps
index 0c2914cb26..5bf6f3e65b 100644
--- a/sysdeps/mips/mips64/libm-test-ulps
+++ b/sysdeps/mips/mips64/libm-test-ulps
@@ -155,7 +155,7 @@ ldouble: 3
 
 Function: "atan2_upward":
 double: 1
-float: 1
+float: 2
 idouble: 1
 ifloat: 2
 ildouble: 2
@@ -393,7 +393,7 @@ ldouble: 3
 
 Function: "carg_upward":
 double: 1
-float: 1
+float: 2
 idouble: 1
 ifloat: 2
 ildouble: 2
diff --git a/sysdeps/powerpc/nofpu/libm-test-ulps b/sysdeps/powerpc/nofpu/libm-test-ulps
index 0350eb9656..41613421de 100644
--- a/sysdeps/powerpc/nofpu/libm-test-ulps
+++ b/sysdeps/powerpc/nofpu/libm-test-ulps
@@ -155,7 +155,7 @@ ldouble: 6
 
 Function: "atan2_upward":
 double: 1
-float: 1
+float: 2
 idouble: 1
 ifloat: 2
 ildouble: 3
@@ -393,7 +393,7 @@ ldouble: 6
 
 Function: "carg_upward":
 double: 1
-float: 1
+float: 2
 idouble: 1
 ifloat: 2
 ildouble: 3