diff --git a/include/wx/defs.h b/include/wx/defs.h
index f1fe077816..06cc68c766 100644
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -711,7 +711,7 @@ typedef wxUint32 wxDword;
     #define wxLongLongSuffix l
     #define wxLongLongFmtSpec _T("l")
     #define wxLongLongIsLong
-#elif (defined(__VISUALC__) && defined(__WIN32__)) || defined( __VMS__ ) 
+#elif (defined(__VISUALC__) && defined(__WIN32__)) 
     #define wxLongLong_t __int64
     #define wxLongLongSuffix i64
     #define wxLongLongFmtSpec _T("I64")
diff --git a/setup.h_vms b/setup.h_vms
index e85b6d24c4..33f1126a26 100644
--- a/setup.h_vms
+++ b/setup.h_vms
@@ -803,6 +803,10 @@
  * Use MS HTML Help controller (win32)
  */
 #define wxUSE_MS_HTML_HELP 0
+/*
+ * Use MS HTML Help via libmspack (Unix)
+ */
+#define wxUSE_LIBMSPACK 1
 
 /*
  * Use iostream.h rather than iostream