diff --git a/Source/build.cpp b/Source/build.cpp
index 7964c136..a30fd38b 100644
--- a/Source/build.cpp
+++ b/Source/build.cpp
@@ -328,7 +328,9 @@ int CEXEBuild::preprocess_string(char *out, const char *in)
   "WINDIR\0"        // 32
   "SYSDIR\0"        // 33
   "LANGUAGE\0"      // 34
+#ifdef NSIS_CONFIG_PLUGIN_SUPPORT
   "PLUGINSDIR\0"    // 35
+#endif
   ;
 
   const char *p=in;
diff --git a/Source/exehead/util.c b/Source/exehead/util.c
index d6aef866..aa4f8203 100644
--- a/Source/exehead/util.c
+++ b/Source/exehead/util.c
@@ -505,11 +505,15 @@ void process_string(char *out, const char *in)
         case VAR_CODES_START + 35: // PLUGINSDIR
           lstrcpy(out, plugins_temp_dir);
           break;
-#endif //NSIS_CONFIG_PLUGIN_SUPPORT
 
+        #if VAR_CODES_START + 35 >= 255
+          #error "Too many variables!  Extend VAR_CODES_START!"
+        #endif
+#else
         #if VAR_CODES_START + 34 >= 255
           #error "Too many variables!  Extend VAR_CODES_START!"
         #endif
+#endif //NSIS_CONFIG_PLUGIN_SUPPORT
       } // switch
       // remove trailing slash
       while (*out && *CharNext(out)) out++;