diff --git a/ChangeLog b/ChangeLog
index 9b7a655987..f63f01739e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2017-06-23  Gabriel F. T. Gomes  <gftg@linux.vnet.ibm.com>
+
+	* manual/libm-err-tab.pl (@all_floats, %suffices, parse_ulps):
+	Enable generation of float128 entries on the error table.
+
 2017-06-23  Gabriel F. T. Gomes  <gftg@linux.vnet.ibm.com>
 
 	* include/float.h: Include libc-header-start.h to get the
diff --git a/manual/libm-err-tab.pl b/manual/libm-err-tab.pl
index 75f5e5b7b7..e0bc3b7289 100755
--- a/manual/libm-err-tab.pl
+++ b/manual/libm-err-tab.pl
@@ -40,11 +40,12 @@ use vars qw (%results @all_floats %suffices %all_functions);
 
 # all_floats is in output order and contains all recognised float types that
 # we're going to output
-@all_floats = ('float', 'double', 'ldouble');
+@all_floats = ('float', 'double', 'ldouble', 'float128');
 %suffices =
   ( 'float' => 'f',
     'double' => '',
-    'ldouble' => 'l'
+    'ldouble' => 'l',
+    'float128' => 'f128'
   );
 
 # Pretty description of platform
@@ -113,7 +114,7 @@ sub parse_ulps {
       $ignore_fn = 0;
       $all_functions{$test} = 1;
     }
-    if (/^i?(float|double|ldouble):/) {
+    if (/^i?(float|double|ldouble|float128):/) {
       ($float, $eps) = split /\s*:\s*/,$_,2;
       if ($ignore_fn) {
 	next;