diff --git a/lib/human.c b/lib/human.c
index b342bf178..36cfd7348 100644
--- a/lib/human.c
+++ b/lib/human.c
@@ -450,8 +450,6 @@ humblock (char const *spec, uintmax_t *block_size, int *options)
 				       "eEgGkKmMpPtTyYzZ0");
 	  if (e != LONGINT_OK)
 	    return e;
-	  if (*ptr)
-	    return LONGINT_INVALID_SUFFIX_CHAR;
 	  for (; ! ('0' <= *spec && *spec <= '9'); spec++)
 	    if (spec == ptr)
 	      {
diff --git a/lib/xstrtoimax.c b/lib/xstrtoimax.c
index 94c657786..2ba136772 100644
--- a/lib/xstrtoimax.c
+++ b/lib/xstrtoimax.c
@@ -30,4 +30,8 @@
 #define __strtol strtoimax
 #define __strtol_t intmax_t
 #define __xstrtol xstrtoimax
+#ifdef INTMAX_MAX
+# define STRTOL_T_MINIMUM INTMAX_MIN
+# define STRTOL_T_MAXIMUM INTMAX_MAX
+#endif
 #include "xstrtol.c"