diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index fb0b853b9f3..fd4ccee431f 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.47 2000/07/08 08:54:01 fgsch Exp $
+# $OpenBSD: Makefile,v 1.48 2000/07/15 07:18:01 brad Exp $
 
 DISTNAME=	fetchmail-5.4.3
 CATEGORIES=	mail
@@ -16,11 +16,11 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
 CONFIGURE_STYLE=	gnu dest
+CONFIGURE_ARGS+= --disable-nls --enable-inet6
 
 FLAVORS=	kerberos ssl
-
 FLAVOR?=
-CONFIGURE_ARGS+= --disable-nls --enable-inet6
+
 .if ${FLAVOR:L} == "kerberos"
 CONFIGURE_ARGS+= --with-kerberos
 .endif
@@ -30,6 +30,7 @@ CONFIGURE_ARGS+= --with-ssl
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/fetchmail
+	@cd ${PREFIX}/man/man1 && ln -sf fetchmail.1 fetchmailconf.1
 	cd ${WRKSRC} && ${INSTALL_DATA} \
 	   sample.rcfile FAQ NOTES FEATURES README COPYING \
 	   fetchmail-FAQ.html fetchmail-features.html \
diff --git a/mail/fetchmail/patches/patch-aa b/mail/fetchmail/patches/patch-aa
deleted file mode 100644
index 8745c7faa49..00000000000
--- a/mail/fetchmail/patches/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Fri Apr 21 04:46:38 2000
-+++ Makefile.in	Tue Apr 25 12:18:28 2000
-@@ -156,7 +156,7 @@ install:
- 	@echo "Installing manual page..."
- 	$(INSTALL_DATA) $(srcdir)/fetchmail.man $(mandir)/fetchmail.$(manext)
- 	rm -f $(mandir)/fetchmailconf.$(manext)
--	ln -s $(mandir)/fetchmail.$(manext) $(mandir)/fetchmailconf.$(manext)
-+	cd $(mandir) && ln -s fetchmail.$(manext) fetchmailconf.$(manext)
- 	@echo "Installing language catalogs..."
- 	@POMAKE@ install
-