diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py
index 1f3c93ad3c..75e4ecfe45 100755
--- a/makepanda/makepanda.py
+++ b/makepanda/makepanda.py
@@ -705,9 +705,11 @@ if (COMPILER == "MSVC"):
         DefSymbol("WX",     "_UNICODE", "")
         DefSymbol("WX",     "UNICODE", "")
     if (PkgSkip("VORBIS")==0):
-        LibName("VORBIS",   GetThirdpartyDir() + "vorbis/lib/libogg_static.lib")
-        LibName("VORBIS",   GetThirdpartyDir() + "vorbis/lib/libvorbis_static.lib")
-        LibName("VORBIS",   GetThirdpartyDir() + "vorbis/lib/libvorbisfile_static.lib")
+        for lib in ('ogg', 'vorbis', 'vorbisfile'):
+            path = GetThirdpartyDir() + "vorbis/lib/lib{0}_static.lib".format(lib)
+            if not os.path.isfile(path):
+                path = GetThirdpartyDir() + "vorbis/lib/{0}.lib".format(lib)
+            LibName("VORBIS", path)
     if (PkgSkip("OPUS")==0):
         LibName("OPUS", GetThirdpartyDir() + "opus/lib/libogg_static.lib")
         LibName("OPUS", GetThirdpartyDir() + "opus/lib/libopus_static.lib")