diff --git a/common.py b/common.py
index 24a7e8a611d..113fc7f5c12 100644
--- a/common.py
+++ b/common.py
@@ -113,3 +113,4 @@ def AddOptions(opts):
     opts.Add(BoolOption('swr', 'Build OpenSWR', 'no'))
     if host_platform == 'windows':
         opts.Add('MSVC_VERSION', 'Microsoft Visual C/C++ version')
+        opts.Add('MSVC_USE_SCRIPT', 'Microsoft Visual C/C++ vcvarsall script', True)
diff --git a/src/gallium/targets/libgl-gdi/SConscript b/src/gallium/targets/libgl-gdi/SConscript
index a8bdc3e5869..132cb73358d 100644
--- a/src/gallium/targets/libgl-gdi/SConscript
+++ b/src/gallium/targets/libgl-gdi/SConscript
@@ -16,6 +16,7 @@ env.Append(LIBS = [
     'user32',
     'kernel32',
     'ws2_32',
+    'advapi32',
 ])
 
 env.Prepend(LIBS = [