diff --git a/setup.h_vms b/setup.h_vms
index 7c14228bc4..ee62da1df4 100644
--- a/setup.h_vms
+++ b/setup.h_vms
@@ -100,6 +100,9 @@
 /* PowerPC Darwin & Mac OS X */
 #undef __POWERPC__
 
+/* MS-DOS with DJGPP */
+#undef __DOS__
+
 /* Stupid hack; __WINDOWS__ clashes with wx/defs.h */
 #ifndef __WINDOWS__
 #undef __WINDOWS__
@@ -611,6 +614,11 @@
  */
 #define wxUSE_UNICODE 0
 
+/*
+ * Use MS Layer for Unicode on Win9X (Win32 only)?
+ */
+#define wxUSE_UNICODE_MSLU 0
+
 /*
  * Work around a bug in GNU libc 5.x wcstombs() implementation.
  *