diff --git a/misc/cdrchive/Makefile b/misc/cdrchive/Makefile
index 94b24b651b0..65993bd95bc 100644
--- a/misc/cdrchive/Makefile
+++ b/misc/cdrchive/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2001/11/13 22:13:23 espie Exp $
+# $OpenBSD: Makefile,v 1.5 2002/03/30 01:03:35 naddy Exp $
 
 COMMENT=		"Qt-based CD creation tool"
 
@@ -9,7 +9,7 @@ NEED_VERSION=		1.483
 
 HOMEPAGE=		http://www.drahthaar.clara.net/cdr.htm
 
-MAINTAINER=		Jacob Meuser <jakemsr@clipper.net>
+MAINTAINER=		Jacob Meuser <jakemsr@jakemsr.com>
 
 # GPL
 PERMIT_PACKAGE_CDROM=	Yes
@@ -18,7 +18,7 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=		http://www.drahthaar.clara.net/ \
-			ftp://ftp.jakemsr.com/pub/jakemsr/obsd-ports/
+			http://www.jakemsr.com/openbsd/ports/
 
 MODULES=		qt2
 
@@ -26,7 +26,7 @@ RUN_DEPENDS=		::misc/cdrecord
 
 SEPARATE_BUILD=		concurrent
 
-CONFIGURE_STYLE=	gnu 
+CONFIGURE_STYLE=	autoconf
 CONFIGURE_ARGS=		--datadir=${PREFIX}/share/doc/cdrchive \
 			--x-includes=${X11BASE}/include \
 			--x-libraries=${X11BASE}/lib \
diff --git a/misc/cdrchive/patches/patch-aclocal_m4 b/misc/cdrchive/patches/patch-aclocal_m4
new file mode 100644
index 00000000000..8df37decfb3
--- /dev/null
+++ b/misc/cdrchive/patches/patch-aclocal_m4
@@ -0,0 +1,14 @@
+$OpenBSD: patch-aclocal_m4,v 1.1 2002/03/30 01:03:35 naddy Exp $
+--- aclocal.m4.orig	Fri Mar 29 00:40:21 2002
++++ aclocal.m4	Fri Mar 29 00:42:17 2002
+@@ -486,8 +486,8 @@ if test -z "$ac_x_libraries" || test "x$
+   x_libraries=$ac_x_libraries
+   X_LDFLAGS="-L$x_libraries"
+ fi
+-all_includes="$X_INCLUDES -I/usr/local/include"
+-all_libraries="$X_LDFLAGS -L/usr/local/lib"
++all_includes="$X_INCLUDES"
++all_libraries="$X_LDFLAGS"
+ 
+ AC_SUBST(X_INCLUDES)
+ AC_SUBST(X_LDFLAGS)