diff --git a/g10/ChangeLog b/g10/ChangeLog
index 3fa453348..3616e4b1a 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,11 @@
+2007-03-14  David Shaw  <dshaw@jabberwocky.com>
+
+	From STABLE-BRANCH-1-4
+
+	* keyserver.c: Windows Vista doesn't grok X_OK and so fails
+	access() tests.  Previous versions interpreted X_OK as F_OK
+	anyway, so we'll just use F_OK directly.
+
 2007-03-09  David Shaw  <dshaw@jabberwocky.com>
 
 	From STABLE-BRANCH-1-4
diff --git a/g10/keyserver.c b/g10/keyserver.c
index 049b971a9..e195e98df 100644
--- a/g10/keyserver.c
+++ b/g10/keyserver.c
@@ -1,6 +1,6 @@
 /* keyserver.c - generic keyserver code
- * Copyright (C) 2001, 2002, 2003, 2004, 2005,
- *               2006 Free Software Foundation, Inc.
+ * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006,
+ *               2007 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -45,6 +45,13 @@
 #include "dns-cert.h"
 #include "pka.h"
 
+#ifdef HAVE_W32_SYSTEM
+/* It seems Vista doesn't grok X_OK and so fails access() tests.
+   Previous versions interpreted X_OK as F_OK anyway, so we'll just
+   use F_OK directly. */
+#undef X_OK
+#define X_OK F_OK
+#endif /* HAVE_W32_SYSTEM */
 
 struct keyrec
 {