diff --git a/devel/cpuflags/Makefile b/devel/cpuflags/Makefile
index 8216f6b6a396..508dd5f510f3 100644
--- a/devel/cpuflags/Makefile
+++ b/devel/cpuflags/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.60 2003/10/02 16:10:00 abs Exp $
+# $NetBSD: Makefile,v 1.61 2003/10/19 00:24:28 rh Exp $
 #
 
-DISTNAME=	cpuflags-0.57
+DISTNAME=	cpuflags-0.58
 CATEGORIES=	sysutils
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/devel/cpuflags/files/cpuflags.NetBSD b/devel/cpuflags/files/cpuflags.NetBSD
index 248df1f38ab5..162cba2d021d 100755
--- a/devel/cpuflags/files/cpuflags.NetBSD
+++ b/devel/cpuflags/files/cpuflags.NetBSD
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: cpuflags.NetBSD,v 1.42 2003/10/02 16:10:00 abs Exp $
+# $NetBSD: cpuflags.NetBSD,v 1.43 2003/10/19 00:24:28 rh Exp $
 
 if [ -x /sbin/sysctl ] ;then
     SYSCTL=/sbin/sysctl
@@ -66,10 +66,10 @@ case $hw_machine_arch in
 	*AMD\ K6-2*)		FLAGS='-march=k6-2'		;;
 	*AMD\ K6*)		FLAGS='-march=k6'		;;
 	*AMD\ Duron*)		FLAGS='-march=athlon'		;;
-	*AMD\ K7*|*AMD\ Athlon*^[4XM]*) FLAGS='-march=athlon'	;;
 	*AMD\ Athlon\ 4*)	FLAGS='-march=athlon-4'		;;
 	*AMD\ Athlon\ MP*)	FLAGS='-march=athlon-mp'	;;
 	*AMD\ Athlon\ XP*)	FLAGS='-march=athlon-xp'	;;
+	*AMD\ K7*|*AMD\ Athlon*) FLAGS='-march=athlon'		;;
 	*386-class*)		FLAGS='-march=i386'		;;
 	*486-class*)		FLAGS='-march=i486'		;;
 	*586-class*)		FLAGS='-march=pentium'		;;