diff --git a/Makefile.bundle.in b/Makefile.bundle.in
index 9b8bb82663..0c4fe3bac9 100644
--- a/Makefile.bundle.in
+++ b/Makefile.bundle.in
@@ -21,6 +21,9 @@ endif
 
 ifndef BUNDLE_NAME
 BUNDLE_NAME = openttd-custom-$(REV)-$(OS)
+ifeq ($(OS),MINGW)
+BUNDLE_NAME := $(BUNDLE_NAME)-win$(CPU_TYPE)
+endif
 endif
 
 # An OSX application bundle needs the data files, lang files and openttd executable in a different location.
diff --git a/Makefile.in b/Makefile.in
index 0d50fc1b1e..6680550fd5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -39,6 +39,7 @@ STRIP       = !!STRIP!!
 TTD         = !!TTD!!
 TTDS        = $(SRC_DIRS:%=%/$(TTD))
 OS          = !!OS!!
+CPU_TYPE    = !!CPU_TYPE!!
 OSXAPP      = !!OSXAPP!!
 LIPO        = !!LIPO!!
 AWK         = !!AWK!!
diff --git a/config.lib b/config.lib
index 1e22ba9ce1..c08b122684 100644
--- a/config.lib
+++ b/config.lib
@@ -3362,6 +3362,7 @@ make_sed() {
 		s@!!OBJS_RC!!@$OBJS_RC@g;
 		s@!!SRCS!!@$SRCS@g;
 		s@!!OS!!@$os@g;
+		s@!!CPU_TYPE!!@$cpu_type@g;
 		s@!!CONFIGURE_FILES!!@$CONFIGURE_FILES@g;
 		s@!!AWK!!@$awk@g;
 		s@!!DISTCC!!@$distcc@g;