diff --git a/version.h b/version.h
index d1c253b3b1..f94226bc8d 100644
--- a/version.h
+++ b/version.h
@@ -12,15 +12,15 @@
 #define TOKEN_PASTE(x,y) x##y
 #endif
 #define ONLY_ONE_DIGIT(x) TOKEN_PASTE(10,x) < 1000
-#define ZERO_STR "0"
+#define WITH_ZERO_PADDING(x) TOKEN_PASTE(0,x)
 #define RUBY_RELEASE_YEAR_STR STRINGIZE(RUBY_RELEASE_YEAR)
 #if ONLY_ONE_DIGIT(RUBY_RELEASE_MONTH)
-#define RUBY_RELEASE_MONTH_STR ZERO_STR STRINGIZE(RUBY_RELEASE_MONTH)
+#define RUBY_RELEASE_MONTH_STR STRINGIZE(WITH_ZERO_PADDING(RUBY_RELEASE_MONTH))
 #else
 #define RUBY_RELEASE_MONTH_STR STRINGIZE(RUBY_RELEASE_MONTH)
 #endif
 #if ONLY_ONE_DIGIT(RUBY_RELEASE_DAY)
-#define RUBY_RELEASE_DAY_STR ZERO_STR STRINGIZE(RUBY_RELEASE_DAY)
+#define RUBY_RELEASE_DAY_STR STRINGIZE(WITH_ZERO_PADDING(RUBY_RELEASE_DAY))
 #else
 #define RUBY_RELEASE_DAY_STR STRINGIZE(RUBY_RELEASE_DAY)
 #endif
diff --git a/win32/setup.mak b/win32/setup.mak
index 143c218d38..8c00710f44 100644
--- a/win32/setup.mak
+++ b/win32/setup.mak
@@ -128,18 +128,16 @@ MSC_VER = _MSC_VER
 <<
 
 verconf.mk: nul
-	@$(CPP) -I$(srcdir) -I$(srcdir)/include <<"Creating $(@)" | findstr "=" >$(@)
+	@$(CPP) -I$(srcdir) -I$(srcdir)/include <<"Creating $(@)" > $(*F).bat && cmd /c $(*F).bat > $(@)
+@echo off
 #define RUBY_REVISION 0
+#define STRINGIZE0(expr) #expr
+#define STRINGIZE(x) STRINGIZE0(x)
 #include "version.h"
-release_year = RUBY_RELEASE_YEAR
-release_month = RUBY_RELEASE_MONTH
-release_day = RUBY_RELEASE_DAY
-#undef RUBY_RELEASE_YEAR
-#undef RUBY_RELEASE_MONTH
-#undef RUBY_RELEASE_DAY
-RUBY_RELEASE_YEAR = $$(release_year)
-RUBY_RELEASE_MONTH = $$(release_month)
-RUBY_RELEASE_DAY = $$(release_day)
+for %%I in (RUBY_RELEASE_DATE) do set ruby_release_date=%%~I
+#undef RUBY_RELEASE_DATE
+echo RUBY_RELEASE_DATE = %ruby_release_date:""=%
+del %0 & exit
 <<
 
 -program-name-: