diff --git a/packages/OS400/curl.inc.in b/packages/OS400/curl.inc.in
index e448162933..b5e46bb16e 100644
--- a/packages/OS400/curl.inc.in
+++ b/packages/OS400/curl.inc.in
@@ -645,6 +645,8 @@
      d                 c                   X'00800000'
      d  CURLPROTO_RTMPTS...
      d                 c                   X'01000000'
+     d  CURLPROTO_GOPHER...
+     d                 c                   X'02000000'
       *
      d CURLoption      s             10i 0 based(######ptr######)               Enum
      d  CURLOPT_FILE   c                   10001
diff --git a/packages/OS400/make-tests.sh b/packages/OS400/make-tests.sh
index 06c9669118..cee3ed95d2 100644
--- a/packages/OS400/make-tests.sh
+++ b/packages/OS400/make-tests.sh
@@ -36,6 +36,11 @@ eval "`sed -e ': begin'                                                 \
         -e 's/\\$(\\([^)]*\\))/${\\1}/g'                                \
         < Makefile.inc`"
 
+#       Special case: redefine chkhostname compilation parameters.
+
+chkhostname_SOURCES=chkhostname.c
+chkhostname_LDADD=curl_gethostname.o
+
 #       Compile all programs.
 #       The list is found in variable "noinst_PROGRAMS"
 
@@ -89,7 +94,15 @@ do      DB2PGM=`db2_name "${PGM}"`
         #       Link program if needed.
 
         if [ "${LINK}" ]
-        then    MODULES="`echo \"${MODULES}\" |
+        then    PGMLDADD="`eval echo \"\\${${PGM}_LDADD}\"`"
+                for LDARG in ${PGMLDADD}
+                do      case "${LDARG}" in
+                        -*)     ;;              # Ignore non-module.
+                        *)      MODULES="${MODULES} "`db2_name "${LDARG}"`
+                                ;;
+                        esac
+                done
+                MODULES="`echo \"${MODULES}\" |
                     sed \"s/[^ ][^ ]*/${TARGETLIB}\/&/g\"`"
                 CMD="CRTPGM PGM(${TARGETLIB}/${DB2PGM})"
                 CMD="${CMD} ENTMOD(QADRT/QADRTMAIN2)"