diff --git a/src/lib/lib.mak b/src/lib/lib.mak
index 1decfc38209..84897a8d74e 100644
--- a/src/lib/lib.mak
+++ b/src/lib/lib.mak
@@ -347,6 +347,12 @@ ARCHFLAGS = -DWORDS_BIGENDIAN=0
 endif
 
 FLACOPTS=-DFLAC__NO_ASM -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DHAVE_CONFIG_H=0 -DFLAC__HAS_OGG=0 -Wno-unused-function $(ARCHFLAGS) -O0
+ifdef MSVC_BUILD
+	# vconv will convert the \" to just a "
+	FLACOPTS += -DVERSION=\\\"1.2.1\\\"
+else
+	FLACOPTS += -DVERSION=\"1.2.1\"
+endif
 ifneq (,$(findstring clang,$(CC)))
 	FLACOPTS += -Wno-unused-const-variable
 endif
diff --git a/src/lib/libflac/include/FLAC/ordinals.h b/src/lib/libflac/include/FLAC/ordinals.h
index 96ed4f8961f..a7a5cd96135 100644
--- a/src/lib/libflac/include/FLAC/ordinals.h
+++ b/src/lib/libflac/include/FLAC/ordinals.h
@@ -77,7 +77,4 @@ typedef FLAC__uint8 FLAC__byte;
 #define false 0
 #endif
 
-// MAME addition -- seems lame to make this a command-line parameter
-#define VERSION "1.2.1"
-
 #endif
diff --git a/src/lib/libflac/libFLAC/format.c b/src/lib/libflac/libFLAC/format.c
index fcc104b7d82..a3f93ddc78c 100644
--- a/src/lib/libflac/libFLAC/format.c
+++ b/src/lib/libflac/libFLAC/format.c
@@ -57,13 +57,13 @@
 #endif
 
 /* VERSION should come from configure */
-FLAC_API const char *FLAC__VERSION_STRING = "1.2.1";
+FLAC_API const char *FLAC__VERSION_STRING = VERSION;
 
 #if defined _MSC_VER || defined __BORLANDC__ || defined __MINW32__
 /* yet one more hack because of MSVC6: */
 FLAC_API const char *FLAC__VENDOR_STRING = "reference libFLAC 1.2.1 20070917";
 #else
-FLAC_API const char *FLAC__VENDOR_STRING = "reference libFLAC " "1.2.1" " 20070917";
+FLAC_API const char *FLAC__VENDOR_STRING = "reference libFLAC " VERSION " 20070917";
 #endif
 
 FLAC_API const FLAC__byte FLAC__STREAM_SYNC_STRING[4] = { 'f','L','a','C' };