diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 47a3dcfd5e..95a9ef4508 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -148,7 +148,7 @@ PLATFORM_DIR = win32
 arch = $(ARCH)-$(PLATFORM)
 sitearch = $(ARCH)-$(RT)
 !if !defined(ruby_version)
-ruby_version = $(MAJOR).$(MINOR).0
+ruby_version = $(MAJOR).$(MINOR).0+$(ABI_VERSION)
 !endif
 !if !defined(RUBY_VERSION_NAME)
 RUBY_VERSION_NAME = $(RUBY_BASE_NAME)-$(ruby_version)
diff --git a/win32/setup.mak b/win32/setup.mak
index 466c1ef515..ff8003a5f0 100644
--- a/win32/setup.mak
+++ b/win32/setup.mak
@@ -195,6 +195,7 @@ echo RUBY_RELEASE_DAY = %ruby_release_day:~-2%
 echo MAJOR = RUBY_VERSION_MAJOR
 echo MINOR = RUBY_VERSION_MINOR
 echo TEENY = RUBY_VERSION_TEENY
+echo ABI_VERSION = RUBY_ABI_VERSION
 #if defined RUBY_PATCHLEVEL && RUBY_PATCHLEVEL < 0
 echo RUBY_DEVEL = yes
 #endif