diff --git a/build/apr_hints.m4 b/build/apr_hints.m4
index fd3d33de05..076d797c56 100644
--- a/build/apr_hints.m4
+++ b/build/apr_hints.m4
@@ -427,12 +427,15 @@ dnl	       # Not a problem in 10.20.  Otherwise, who knows?
         AC_DEFINE(HAVE_ZOS_PTHREADS, 1, [Define for z/OS pthread API nuances])
         APR_ADDTO(CPPFLAGS, [-U_NO_PROTO -DSIGPROCMASK_SETS_THREAD_MASK -DTCP_NODELAY=1])
         ;;
-    *-ibm-as400)
+    *-ibm-as400 | *-ibm-os400)
         APR_SETIFNULL(apr_lock_method, [USE_SYSVSEM_SERIALIZE])
         APR_SETIFNULL(apr_process_lock_is_global, [yes])
         APR_SETIFNULL(apr_gethostbyname_is_thread_safe, [yes])
         APR_SETIFNULL(apr_gethostbyaddr_is_thread_safe, [yes])
         APR_SETIFNULL(apr_getservbyname_is_thread_safe, [yes])
+        APR_ADDTO(CFLAGS, [-D_THREAD_SAFE -D_LINUX_SOURCE_COMPAT -pthread])
+        APR_SETVAR(SHELL, [/qopensys/bin/sh])
+        APR_SETVAR(CONFIG_SHELL, [/qopensys/bin/sh])
         ;;
     *mingw*)
         APR_ADDTO(INTERNAL_CPPFLAGS, -DBINPATH=$apr_builddir/test/.libs)
diff --git a/configure.in b/configure.in
index 8c2a0cbdf0..4f2ceebb29 100644
--- a/configure.in
+++ b/configure.in
@@ -1476,7 +1476,7 @@ case $host in
                                   USE_SHMEM_SHMGET)
         fi
         ;;
-    *aix* )
+    *aix*|*os400 )
         # AIX cannot lseek() shared memory, and we always truncate/lseek together
         APR_DECISION_OVERRIDE(USE_SHMEM_SHMGET)
        ;;
@@ -2912,19 +2912,30 @@ dnl ----------------------------- Checking for UUID Support
 AC_MSG_NOTICE([])
 AC_MSG_NOTICE([Checking for OS UUID Support...])
 
-AC_CHECK_HEADERS(uuid.h uuid/uuid.h sys/uuid.h, break)
+if [[[ "$host" != *os400 ]]]; then
+    AC_CHECK_HEADERS(uuid.h uuid/uuid.h sys/uuid.h, break)
+else
+    AC_CHECK_HEADERS(uuid/uuid.h, break)
+fi
 
 apr_revert_save_LIBS=$LIBS
 
 # Prefer the flavor(s) that live in libc;
 AC_SEARCH_LIBS(uuid_create, uuid)
 AC_SEARCH_LIBS(uuid_generate, uuid)
+if [[[ "$host" == *os400 ]]]; then
+    ac_cv_search_uuid_create="no"
+fi
 if test "$ac_cv_search_uuid_create" = "none required" -o \
         "$ac_cv_search_uuid_generate" = "none required"; then
  LIBS=$apr_revert_save_LIBS
 fi
-
-AC_CHECK_FUNCS(uuid_create uuid_generate)
+if [[[ "$host" != *os400 ]]]; then
+    AC_CHECK_FUNCS(uuid_create uuid_generate)
+else
+   AC_CHECK_FUNCS(uuid_generate)
+   ac_cv_func_uuid_create="no"
+fi
 
 AC_CACHE_CHECK([for os uuid usability], [apr_cv_osuuid], [
 # Ensure this test closely mirrors misc/unix/rand.c!