diff --git a/tools/winapi/winapi.pm b/tools/winapi/winapi.pm
index 491063e17cf..db0b06a67dc 100644
--- a/tools/winapi/winapi.pm
+++ b/tools/winapi/winapi.pm
@@ -279,9 +279,9 @@ sub parse_spec_file($$) {
 	}
 
 	my $ordinal;
-	my $ARCHES="alpha|i386|powerpc|sparc|x86_64";
+	my $ARCHES="alpha|i386|powerpc|sparc|win32|win64|x86_64";
 	if(/^(\d+|@)\s+
-	   (pascal|stdcall|cdecl|varargs)\s+
+	   (cdecl|pascal|stdcall|varargs)\s+
 	   ((?:(?:-arch=(?:$ARCHES)(?:,(?:$ARCHES))*|-noname|-norelay|-i386|-ret16|-ret64|-register|-interrupt|-private)\s+)*)(\S+)\s*\(\s*(.*?)\s*\)\s*(\S*)$/x)
 	{
 	    my $calling_convention = $2;
@@ -440,7 +440,7 @@ sub parse_spec_file($$) {
 	    } else { # if($$function_external_module{$external_name} !~ /$module/) {
 		$$function_external_module{$external_name} .= " & $module";
 	    }
-	} elsif(/^(\d+|@)\s+extern(?:\s+(?:-norelay|-i386|-ret16|-ret64))?\s+(\S+)\s*(\S*)$/) {
+	} elsif(/^(\d+|@)\s+extern(?:\s+(?:-arch=(?:$ARCHES)(?:,(?:$ARCHES))*|-norelay|-i386|-ret16|-ret64))?\s+(\S+)\s*(\S*)$/) {
 	    $ordinal = $1;
 
 	    my $external_name = $2;