diff --git a/erts/emulator/utils/make_version b/erts/emulator/utils/make_version
index 294520e135dc..f3172d184bf9 100755
--- a/erts/emulator/utils/make_version
+++ b/erts/emulator/utils/make_version
@@ -52,6 +52,16 @@ my $architecture = shift;
 defined $architecture or die "No architecture specified";
 $architecture =~ s&^.*[/\\]&&;	# Remove directory part if any
 
+if ($architecture eq "win32") {
+  if ($ENV{"CONFIG_SUBTYPE"} eq "arm64" || $ENV{"CONFIG_SUBTYPE"} eq "x64_arm64") {
+    $architecture = "aarch64-pc-windows";
+  } elsif ($ENV{"CONFIG_SUBTYPE"} eq "win64") {
+    $architecture = "x86_64-pc-windows";
+  } elsif ($ENV{"CONFIG_SUBTYPE"} eq "win32") {
+    $architecture = "i686-pc-windows";
+  }
+}
+
 open(FILE, ">$outputfile") or die "Can't create $outputfile: $!";
 
 print FILE <<EOF;