diff --git a/ChangeLog b/ChangeLog
index bfcdac520..15fb0df8e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 20010103
  - (bal) Cygwin clean up by Corinna Vinschen <vinschen@redhat.com>
+ - (bal) renamed queue.h to fake-queue.h (even if it's an OpenBSD
+   based file) to ensure #include space does not get confused.
 
 20010102
  - (bal) Makefile fix where sourcedir != builddir by Corinna Vinschen 
diff --git a/openbsd-compat/queue.h b/openbsd-compat/fake-queue.h
similarity index 100%
rename from openbsd-compat/queue.h
rename to openbsd-compat/fake-queue.h
diff --git a/ssh-keyscan.c b/ssh-keyscan.c
index 64ac551b5..f753ce821 100644
--- a/ssh-keyscan.c
+++ b/ssh-keyscan.c
@@ -13,7 +13,7 @@ RCSID("$OpenBSD: ssh-keyscan.c,v 1.11 2001/01/21 19:05:57 markus Exp $");
 #if defined(HAVE_SYS_QUEUE_H)  &&  !defined(HAVE_BOGUS_SYS_QUEUE_H)
 #include <sys/queue.h>
 #else
-#include "bsd-queue.h"
+#include "fake-queue.h"
 #endif
 #include <errno.h>