diff --git a/ares/m4/cares-functions.m4 b/ares/m4/cares-functions.m4
index 0169cf77ec03126ceeb3a86d89b8f9e7d83810cd..6a4eb05dc83896c0788058f683324a531de5ce22 100644
--- a/ares/m4/cares-functions.m4
+++ b/ares/m4/cares-functions.m4
@@ -16,7 +16,7 @@
 #***************************************************************************
 
 # File version for 'aclocal' use. Keep it a single number.
-# serial 33
+# serial 34
 
 
 dnl CARES_INCLUDES_ARPA_INET
@@ -1026,6 +1026,12 @@ AC_DEFUN([CARES_CHECK_FUNC_GETADDRINFO], [
       freebsd*)
         tst_tsafe_getaddrinfo="yes"
         ;;
+      hpux[[123456789]].* | hpux10.* | hpux11.0* | hpux11.10*)
+        tst_tsafe_getaddrinfo="no"
+        ;;
+      hpux*)
+        tst_tsafe_getaddrinfo="yes"
+        ;;
       linux*)
         tst_tsafe_getaddrinfo="yes"
         ;;
diff --git a/m4/curl-functions.m4 b/m4/curl-functions.m4
index 8cd99b07bb00c05113a8c59799fa44c80799c676..5cab3c0b2995420b1433f4d2b03775eaaf8eb758 100644
--- a/m4/curl-functions.m4
+++ b/m4/curl-functions.m4
@@ -22,7 +22,7 @@
 #***************************************************************************
 
 # File version for 'aclocal' use. Keep it a single number.
-# serial 55
+# serial 56
 
 
 dnl CURL_INCLUDES_ARPA_INET
@@ -1650,6 +1650,12 @@ AC_DEFUN([CURL_CHECK_FUNC_GETADDRINFO], [
       freebsd*)
         tst_tsafe_getaddrinfo="yes"
         ;;
+      hpux[[123456789]].* | hpux10.* | hpux11.0* | hpux11.10*)
+        tst_tsafe_getaddrinfo="no"
+        ;;
+      hpux*)
+        tst_tsafe_getaddrinfo="yes"
+        ;;
       linux*)
         tst_tsafe_getaddrinfo="yes"
         ;;