diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index fc962ad6a..824992efb 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-26  Chris Sutcliffe  <ir0n3h4d@users.sourceforge.net>
+
+	* include/shldisp.h (AUTOCOMPLETEOPTIONS): Add version guard around
+	ACO_WORD_FILTER and ACO_NOPREFIXFILTERING.
+
 2010-01-26  Chris Sutcliffe  <ir0n3h4d@users.sourceforge.net>
 
 	* include/shldisp.h (AUTOCOMPLETEOPTIONS): Add enum.
diff --git a/winsup/w32api/include/shldisp.h b/winsup/w32api/include/shldisp.h
index 87dbffe6a..c0665ccff 100755
--- a/winsup/w32api/include/shldisp.h
+++ b/winsup/w32api/include/shldisp.h
@@ -17,8 +17,10 @@ typedef enum tagAUTOCOMPLETEOPTIONS {
     ACO_USETAB = 0x10,
     ACO_UPDOWNKEYDROPSLIST = 0x20,
     ACO_RTLREADING = 0x40,
+#if (_WIN32_WINNT >= 0x0600)
     ACO_WORD_FILTER = 0x80,
     ACO_NOPREFIXFILTERING = 0x100
+#endif
 } AUTOCOMPLETEOPTIONS;
 
 #define INTERFACE IAutoComplete