diff --git a/ChangeLog b/ChangeLog
index ce8b52e65..5abd1ae22 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
  - (dtucker) [openbsd-compat/port-aix.{c,h}] Remove AIX specific initgroups
    implementation.  It's not needed to fix bug #1081 and breaks the build
    on some AIX configurations.
+ - (dtucker) [openbsd-compat/regress/strtonumtest.c] Bug #1347: Use platform's
+   equivalent of LLONG_MAX for the compat regression tests, which makes them
+   run on AIX and HP-UX.  Patch from David Leonard.
 
 20080307
  - (djm) OpenBSD CVS Sync
@@ -3706,4 +3709,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.4862 2008/03/09 05:36:55 dtucker Exp $
+$Id: ChangeLog,v 1.4863 2008/03/09 06:10:09 dtucker Exp $
diff --git a/openbsd-compat/regress/strtonumtest.c b/openbsd-compat/regress/strtonumtest.c
index cb8585129..50ca5bd22 100644
--- a/openbsd-compat/regress/strtonumtest.c
+++ b/openbsd-compat/regress/strtonumtest.c
@@ -21,6 +21,20 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+/* LLONG_MAX is known as LONGLONG_MAX on AIX */
+#if defined(LONGLONG_MAX) && !defined(LLONG_MAX)
+# define LLONG_MAX LONGLONG_MAX
+# define LLONG_MIN LONGLONG_MIN
+#endif
+
+/* LLONG_MAX is known as LONG_LONG_MAX on HP-UX */
+#if defined(LONG_LONG_MAX) && !defined(LLONG_MAX)
+# define LLONG_MAX LONG_LONG_MAX
+# define LLONG_MIN LONG_LONG_MIN
+#endif
+
+long long strtonum(const char *, long long, long long, const char **);
+
 int fail;
 
 void