diff --git a/audio/esound/Makefile b/audio/esound/Makefile
index 6450977d126..8d406f978d7 100644
--- a/audio/esound/Makefile
+++ b/audio/esound/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.30 2002/11/21 02:33:59 margarida Exp $
+# $OpenBSD: Makefile,v 1.31 2004/03/02 07:57:21 brad Exp $
 # $FreeBSD: Makefile,v 1.8 1999/03/09 01:08:46 nectar Exp $
 
 COMMENT=	"sound library for Enlightenment"
@@ -21,7 +21,6 @@ PERMIT_DISTFILES_FTP=	Yes
 
 SEPARATE_BUILD=	concurrent
 CONFIGURE_STYLE= autoconf
-AUTOCONF_NEW=	Yes
 CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
 CONFIGURE_ARGS+= --enable-static --with-libwrap
 
diff --git a/audio/rsynth/Makefile b/audio/rsynth/Makefile
index 67bd0f32fe7..328bb889f7a 100644
--- a/audio/rsynth/Makefile
+++ b/audio/rsynth/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.20 2002/12/23 07:56:36 pvalchev Exp $
+# $OpenBSD: Makefile,v 1.21 2004/03/02 07:57:21 brad Exp $
 
 COMMENT=	"speech synthesizer"
 DISTNAME=	rsynth-2.0
@@ -15,7 +15,6 @@ FAKE_FLAGS=		PREFIX=${WRKINST}${PREFIX}
 LIB_DEPENDS=	gdbm.::databases/gdbm
 
 CONFIGURE_STYLE=autoconf
-AUTOCONF_NEW=Yes
 CONFIGURE_ENV=	LDFLAGS=-L${LOCALBASE}/lib CPPFLAGS=-I${LOCALBASE}/include
 CONFIGURE_ARGS=	`$(CC) -dumpmachine`
 SEPARATE_BUILD=	simple
diff --git a/comms/conserver/Makefile b/comms/conserver/Makefile
index 3867470697f..0101f5cfe0d 100644
--- a/comms/conserver/Makefile
+++ b/comms/conserver/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.24 2003/07/09 07:17:15 pvalchev Exp $
+# $OpenBSD: Makefile,v 1.25 2004/03/02 07:57:21 brad Exp $
 
 COMMENT=	"manage remote serial consoles via TCP/IP"
 
@@ -9,7 +9,7 @@ MAINTAINER=	Peter Valchev <pvalchev@openbsd.org>
 
 HOMEPAGE=	http://www.conserver.com
 
-# License: BSD
+# BSD
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
@@ -17,7 +17,7 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=	ftp://ftp.conserver.com/conserver/
 
-AUTOCONF_NEW=	Yes
+AUTOCONF_VERSION= 2.54
 CONFIGURE_STYLE= autoconf
 CONFIGURE_ARGS=	--with-64bit \
 		--with-master=localhost
diff --git a/games/eboard/Makefile b/games/eboard/Makefile
index b9a4f1c3eea..50165b61d6a 100644
--- a/games/eboard/Makefile
+++ b/games/eboard/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.25 2004/02/25 02:35:16 naddy Exp $
+# $OpenBSD: Makefile,v 1.26 2004/03/02 07:57:21 brad Exp $
 
 COMMENT=	"gtk+ chess board interface"
 
@@ -22,7 +22,7 @@ LIB_DEPENDS=		Imlib.19,gdk_imlib::graphics/imlib
 MODULES=		gettext
 
 USE_X11=		Yes
-AUTOCONF_NEW=		Yes
+AUTOCONF_VERSION=	2.52
 CONFIGURE_STYLE=	autoconf
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
                 LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/graphics/gdk-pixbuf/Makefile b/graphics/gdk-pixbuf/Makefile
index ca13de00546..1a47e4e8b8f 100644
--- a/graphics/gdk-pixbuf/Makefile
+++ b/graphics/gdk-pixbuf/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.29 2003/12/19 19:48:32 brad Exp $
+# $OpenBSD: Makefile,v 1.30 2004/03/02 07:57:21 brad Exp $
 
 COMMENT=	"GdkPixbuf graphics library"
 COMMENT-gnome=	"GdkPixbuf graphics library (GNOME Canvas)"
@@ -22,7 +22,7 @@ MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gdk-pixbuf/0.22/}
 
 SEPARATE_BUILD=	concurrent
 CONFIGURE_STYLE= autoconf
-AUTOCONF_NEW=	Yes
+AUTOCONF_VERSION= 2.52
 CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
 CONFIGURE_ARGS+= --disable-modules \
 		 --disable-mmx \
diff --git a/sysutils/knutclient/Makefile b/sysutils/knutclient/Makefile
index d00f3708636..df775872e67 100644
--- a/sysutils/knutclient/Makefile
+++ b/sysutils/knutclient/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2003/04/17 09:18:56 wilfried Exp $
+# $OpenBSD: Makefile,v 1.2 2004/03/02 07:57:20 brad Exp $
 
 COMMENT=		"KDE UPS Monitoring tool"
 
@@ -20,7 +20,6 @@ MASTER_SITES=		ftp://ftp.buzuluk.cz/pub/alo/knutclient/
 EXTRACT_SUFX=		.tar.gz
 
 # Patch Hack
-MODKDE_VERSION=		NoPatch
 MODULES=		kde
 
 LIB_DEPENDS=		DCOP,kdecore.4,kdefx,kdeui::x11/kde/libs3 \
@@ -30,7 +29,7 @@ USE_X11=		Yes
 USE_GMAKE=		Yes
 
 CONFIGURE_STYLE=	autoconf
-AUTOCONF_NEW=		Yes
+AUTOCONF_VERSION=	2.52
 MODGNU_CONFIG_GUESS_DIRS=	${MODKDE_CONFIG_GUESS_DIRS}
 CONFIGURE_ARGS+=	${MODKDE_CONFIGURE_ARGS}
 CONFIGURE_ENV+=		${MODKDE_CONFIGURE_ENV}
diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index a60267f41ec..b1505c9c977 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2003/10/08 17:13:19 sturm Exp $
+# $OpenBSD: Makefile,v 1.20 2004/03/02 07:57:21 brad Exp $
 
 COMMENT=		"screen saver and locker for the X Window System"
 
@@ -29,7 +29,7 @@ USE_GMAKE=		Yes
 NO_REGRESS=		Yes
 
 CONFIGURE_STYLE=	autoconf
-AUTOCONF_NEW=		Yes
+AUTOCONF_VERSION=	2.54
 CONFIGURE_ARGS+=	--with-hackdir="${PREFIX}/libexec/xscreensaver"
 CONFIGURE_ARGS+=	--with-gl
 CONFIGURE_ARGS+=	--with-xpm