diff --git a/lib/NQP/Config.pm b/lib/NQP/Config.pm
index 892cc71..2f01e89 100644
--- a/lib/NQP/Config.pm
+++ b/lib/NQP/Config.pm
@@ -247,16 +247,23 @@ sub make_cmd {
         my $has_gcc   = 0 == system('gcc --version >NUL 2>&1');
         if ($has_cl) {
             if ( $cl_report =~
-                /Microsoft\s.*\sCompiler\s+Version\s+(\d+(?:\.\d+)+)/i )
+                /Microsoft\s.*\sCompiler\s+Version\s+(\d+(?:\.\d+)+)\s+for\s+(\D+\d+)/i )
             {
                 my $actual_version = $1;
+		my $cl_arch        = $2;
                 my $expect_version = "19.0";
+		
                 if ( version->parse($actual_version) < $expect_version ) {
                     $self->sorry( "Expected Microsoft Compiler version "
                           . $expect_version
                           . "+, but got "
                           . $actual_version );
                 }
+                if ( $cl_arch !~ m/\D+64$/ ) {
+                    $self->sorry( "On Microsoft Windows, Rakudo compiles currently only on "
+                          . "64bit architectures, but we are on "
+                          . $cl_arch );
+                }
             }
         }
         if (