diff --git a/buildconf b/buildconf
index ef192513b1f9a21fc673c01c36e369d1df3a3f68..58f9defa4862b816c72aaaea7bf8f3bc1bb9e273 100755
--- a/buildconf
+++ b/buildconf
@@ -312,6 +312,18 @@ if test "x$tmp_host_type" = "xSunOS"; then
   IFS=$old_IFS
   echo "buildconf: SED: $SED"
 
+  echo "buildconf: Feeding acinclude.m4 with reentrant.m4"
+
+  sed 's/m4_include.*m4.*reentrant.m4.*//' acinclude.m4 > acinclude.2
+  mv acinclude.2 acinclude.m4
+  cat m4/reentrant.m4 >> acinclude.m4
+  rm -f m4/reentrant.m4
+
+  sed 's/m4_include.*m4.*reentrant.m4.*//' ares/acinclude.m4 > ares/acinclude.2
+  mv ares/acinclude.2 ares/acinclude.m4
+  cat ares/m4/reentrant.m4 >> ares/acinclude.m4
+  rm -f ares/m4/reentrant.m4
+
 fi
 
 echo "buildconf: running libtoolize"