diff --git a/CHANGES b/CHANGES
index b5ab4b71347aec33f661ddabaee90ad2bd42cc22..bd1ef52e8a69f70335444ea1872a7174b813c45e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -20,6 +20,9 @@ Yang Tse (7 Aug 2008)
 
 - Skip data type check in DO_CURL_OFF_T_CHECK macro when argument is empty.
 
+- Adjusted testcurl.pl to copy checked out curlbuild.h.dist as curlbuild.h
+  for non-configure targets when the host system doesn't run buildconf.bat.
+
 - Prevent buildconf from removing 'Makefile' and 'missing' files. This would
   blow away our CVS checked files 'missing' and 'hiper/Makefile'.
 
diff --git a/tests/testcurl.pl b/tests/testcurl.pl
index ece15e8b70cb8a0772e5fe55cdeb505a086a870a..d18660377db3bf305b2baf0ca210d9e8251eb83e 100755
--- a/tests/testcurl.pl
+++ b/tests/testcurl.pl
@@ -489,6 +489,7 @@ if ($configurebuild) {
   elsif (($^O eq 'linux') || ($targetos =~ /netware/)) {
     system("cp -afr ../$CURLDIR/* ."); 
     system("cp -af ../$CURLDIR/Makefile.dist Makefile"); 
+    system("cp -af ../$CURLDIR/include/curl/curlbuild.h.dist include/curl/curlbuild.h");
     system("$make -i -C lib -f Makefile.$targetos prebuild");
     system("$make -i -C src -f Makefile.$targetos prebuild");
   }