diff --git a/configfsf.sub b/configfsf.sub
index 8b612ab8..74b740f8 100755
--- a/configfsf.sub
+++ b/configfsf.sub
@@ -1298,7 +1298,7 @@ case $basic_machine in
 	pmac | pmac-mpw)
 		basic_machine=powerpc-apple
 		;;
-	*-unknown)
+	*-unknown | *-pc | *-apple | *-w64)
 		# Make sure to match an already-canonicalized machine name.
 		;;
 	*)
diff --git a/yasm/config/config.sub b/yasm/config/config.sub
index 8b612ab8..74b740f8 100755
--- a/yasm/config/config.sub
+++ b/yasm/config/config.sub
@@ -1298,7 +1298,7 @@ case $basic_machine in
 	pmac | pmac-mpw)
 		basic_machine=powerpc-apple
 		;;
-	*-unknown)
+	*-unknown | *-pc | *-apple | *-w64)
 		# Make sure to match an already-canonicalized machine name.
 		;;
 	*)