diff --git a/ChangeLog b/ChangeLog
index 81cd5ad5..2f61d4d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-23  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* lib/autoconf/general.m4 (AC_SITE_LOAD): Guard against file
+	names beginning with `-' again.
+
 2007-08-22  Stepan Kasal  <kasal@ucw.cz>
 	    Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 6350a56d..b5cd91b4 100644
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -1821,7 +1821,7 @@ else
 fi
 for ac_site_file in "$ac_site_file1" "$ac_site_file2"
 do
-  test "$ac_site_file" = NONE && continue
+  test "x$ac_site_file" = xNONE && continue
   if test -r "$ac_site_file"; then
     AC_MSG_NOTICE([loading site script $ac_site_file])
     sed 's/^/| /' "$ac_site_file" >&AS_MESSAGE_LOG_FD