--- a/src/libgit2/CMakeLists.txt
+++ b/src/libgit2/CMakeLists.txt
@@ -101,7 +101,7 @@ if(SONAME)
 	set_target_properties(libgit2package PROPERTIES VERSION ${libgit2_VERSION})
 	set_target_properties(libgit2package PROPERTIES SOVERSION "${libgit2_VERSION_MAJOR}.${libgit2_VERSION_MINOR}")
 	if(LIBGIT2_FILENAME)
-		target_compile_definitions(libgit2package PRIVATE LIBGIT2_FILENAME=\"${LIBGIT2_FILENAME}\")
+		target_compile_definitions(libgit2package PRIVATE LIBGIT2_FILENAME=${LIBGIT2_FILENAME})
 		set_target_properties(libgit2package PROPERTIES OUTPUT_NAME ${LIBGIT2_FILENAME})
 	elseif(DEFINED LIBGIT2_PREFIX)
 		set_target_properties(libgit2package PROPERTIES PREFIX "${LIBGIT2_PREFIX}")
--- a/src/libgit2/git2.rc
+++ b/src/libgit2/git2.rc
@@ -2,23 +2,15 @@
 #include "../../include/git2/version.h"
 
 #ifndef LIBGIT2_FILENAME
-# ifdef __GNUC__
-#  define LIBGIT2_FILENAME git2
-# else
-#  define LIBGIT2_FILENAME "git2"
-# endif
+# define LIBGIT2_FILENAME git2
 #endif
 
 #ifndef LIBGIT2_COMMENTS
 # define LIBGIT2_COMMENTS "For more information visit http://libgit2.github.com/"
 #endif
 
-#ifdef __GNUC__
-# define _STR(x) #x
-# define STR(x) _STR(x)
-#else
-# define STR(x) x
-#endif
+#define _STR(x) #x
+#define STR(x) _STR(x)
 
 #ifdef __GNUC__
 VS_VERSION_INFO		VERSIONINFO