diff --git a/distrib/configure-bin.in b/distrib/configure-bin.in
index 9a6aec2794a65606f821d81cddf161952eb33270..bf88bc8dd1bcd543a1a98941703e7c48771f4b5e 100644
--- a/distrib/configure-bin.in
+++ b/distrib/configure-bin.in
@@ -28,6 +28,10 @@ alpha-dec-osf[[12]]*)
 	TargetPlatform=alpha-dec-osf1;;
 alpha-dec-osf[[34]]*)
 	TargetPlatform=alpha-dec-osf3;;
+alpha-unknown-linux)
+	TargetPlatform=alpha-unknown-linux;;
+alpha-unknown-freebsd*)
+	TargetPlatform=alpha-unknown-freebsd;;
 hppa1.1-hp-hpux*)
 	TargetPlatform=hppa1.1-hp-hpux;;
 i[[3456]]86-*-linuxaout*)
@@ -36,8 +40,8 @@ i[[3456]]86-*-linux*)
 	TargetPlatform=i386-unknown-linux;;
 i[[3456]]86-*-freebsd2*)
 	TargetPlatform=i386-unknown-freebsd2;;
-i[[3456]]86-*-freebsd3*)
-	TargetPlatform=i386-unknown-freebsd3;;
+i[[3456]]86-*-freebsd[[^0-2]]*)
+	TargetPlatform=i386-unknown-freebsd;;
 i[[3456]]86-*-netbsd*)
 	TargetPlatform=i386-unknown-netbsd;;
 i[[3456]]86-*-solaris2*)