diff --git a/include/versioninfo.h b/include/versioninfo.h
index 8477a61c0..b34936d57 100644
--- a/include/versioninfo.h
+++ b/include/versioninfo.h
@@ -1,7 +1,11 @@
+#include "lmms_basics.h"
+
 #ifdef __GNUC__
-#define GCC_VERSION "GCC " __VERSION__
+#define COMPILER_VERSION "GCC " __VERSION__
+#elif defined(_MSC_VER)
+#define COMPILER_VERSION "MSVC " STRINGIFY(_MSC_FULL_VER)
 #else
-#define GCC_VERSION "unknown compiler"
+#define COMPILER_VERSION "unknown compiler"
 #endif
 
 #ifdef LMMS_HOST_X86
diff --git a/src/core/main.cpp b/src/core/main.cpp
index dab9d445a..78e282a14 100644
--- a/src/core/main.cpp
+++ b/src/core/main.cpp
@@ -130,7 +130,7 @@ void printVersion( char *executableName )
 		"License as published by the Free Software Foundation; either\n"
 		"version 2 of the License, or (at your option) any later version.\n\n"
 		"Try \"%s --help\" for more information.\n\n", LMMS_VERSION,
-		PLATFORM, MACHINE, QT_VERSION_STR, GCC_VERSION,
+		PLATFORM, MACHINE, QT_VERSION_STR, COMPILER_VERSION,
 		LMMS_PROJECT_COPYRIGHT, executableName );
 }
 
diff --git a/src/gui/AboutDialog.cpp b/src/gui/AboutDialog.cpp
index 618d35966..11672e6a2 100644
--- a/src/gui/AboutDialog.cpp
+++ b/src/gui/AboutDialog.cpp
@@ -44,7 +44,7 @@ AboutDialog::AboutDialog(QWidget* parent) :
 					arg( PLATFORM ).
 					arg( MACHINE ).
 					arg( QT_VERSION_STR ).
-					arg( GCC_VERSION ) );
+					arg( COMPILER_VERSION ) );
 	versionLabel->setTextInteractionFlags(
 					versionLabel->textInteractionFlags() |
 					Qt::TextSelectableByMouse );