diff --git a/gnulib b/gnulib
index e046ffb..80cd995 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit e046ffb123d352dec87f91fc638490572ef4d31d
+Subproject commit 80cd995cdcbf4b9ded895a43621a11f11806ad8d
diff --git a/libparted/labels/pt-limit.gperf b/libparted/labels/pt-limit.gperf
index f834647..7b2efb8 100644
--- a/libparted/labels/pt-limit.gperf
+++ b/libparted/labels/pt-limit.gperf
@@ -19,7 +19,7 @@ sun,128ULL*UINT32_MAX,UINT32_MAX
 #
 bsd,UINT32_MAX,UINT32_MAX
 # aix,UINT32_MAX,UINT32_MAX
-loop,UINT32_MAX,UINT32_MAX
+# loop,UINT64_MAX,UINT64_MAX
 pc98,UINT32_MAX,UINT32_MAX
 #
 # FIXME: not verified.  looks like these are cylinder aligned, too
diff --git a/libparted/labels/pt-tools.c b/libparted/labels/pt-tools.c
index 9992529..ff3186d 100644
--- a/libparted/labels/pt-tools.c
+++ b/libparted/labels/pt-tools.c
@@ -127,7 +127,7 @@ ptt_partition_max_start_len (char const *pt_type, const PedPartition *part)
 			     " of %jd"),
 			   part->geom.length,
 			   pt_type,
-			   UINT32_MAX);
+			   pt_lim->max_length);
       return 0;
     }
 
@@ -140,7 +140,7 @@ ptt_partition_max_start_len (char const *pt_type, const PedPartition *part)
 			   " of %jd"),
 			 part->geom.start,
 			 pt_type,
-			 UINT32_MAX);
+			 pt_lim->max_start_sector);
     return 0;
   }