diff --git a/security/sudo/Makefile b/security/sudo/Makefile
index 877ff8393191..9d7c7190f456 100644
--- a/security/sudo/Makefile
+++ b/security/sudo/Makefile
@@ -1,21 +1,21 @@
 # New ports collection makefile for:    sudo
-# Version required:     1.6
+# Version required:     1.6.1
 # Date created:         Sun Aug 13 12:36:14 CDT 1995
 # Whom:                 erich@rrnet.com
 #
 # $FreeBSD$
 #
 
-DISTNAME=	sudo-1.6
+DISTNAME=	sudo-1.6.1
 CATEGORIES=	security
-MASTER_SITES=	ftp://ftp.cs.colorado.edu/pub/sysadmin/sudo/OLD/
+MASTER_SITES=	ftp://ftp.cs.colorado.edu/pub/sysadmin/sudo/
 
 MAINTAINER=	mharo@FreeBSD.org
 
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS=	--with-skey \
-		--sysconfdir=/usr/local/etc \
+		--sysconfdir=${PREFIX}/etc \
 		--disable-log-wrap \
 		--with-ignore-dot \
 		--with-tty-tickets \
@@ -25,6 +25,9 @@ CONFIGURE_ARGS=	--with-skey \
 MAN5=		sudoers.5
 MAN8=		sudo.8 visudo.8
 
+post-patch:
+	perl -i -pe 's,!!PREFIX!!,${PREFIX},g' ${WRKSRC}/*.man
+
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/sample.sudoers ${PREFIX}/etc/sudoers.sample
 
diff --git a/security/sudo/distinfo b/security/sudo/distinfo
index 77863d58b1a6..4540e0b3bbf7 100644
--- a/security/sudo/distinfo
+++ b/security/sudo/distinfo
@@ -1 +1 @@
-MD5 (sudo-1.6.tar.gz) = 437331519c93d0c7cb3b745dd8d7489d
+MD5 (sudo-1.6.1.tar.gz) = 9ddb779a7f378ca013e1b327292afba9
diff --git a/security/sudo/files/patch-aa b/security/sudo/files/patch-aa
index d7a7643d6f79..6c874760c52d 100644
--- a/security/sudo/files/patch-aa
+++ b/security/sudo/files/patch-aa
@@ -1,17 +1,3 @@
---- configure.orig	Mon Nov  8 15:59:48 1999
-+++ configure	Thu Dec 16 22:54:41 1999
-@@ -681,8 +681,8 @@
- 
- test "$mandir" = '${prefix}/man' && mandir='$(prefix)/man'
- test "$bindir" = '${exec_prefix}/bin' && bindir='$(exec_prefix)/bin'
--test "$sbindir" = '${exec_prefix}/sbin' && sbindir='$(exec_prefix)/sbin'
--test "$sysconfdir" = '${prefix}/etc' && sysconfdir='/etc'
-+test "$sbindir" = '${exec_prefix}/sbin' || sbindir='$(exec_prefix)/sbin'
-+#test "$sysconfdir" = '${prefix}/etc' || sysconfdir='/etc'
- 
- 
- # Check whether --with-otp-only or --without-otp-only was given.
-@@ -7737,7 +7737,7 @@
  fi
  
  if test "$with_skey" = "yes"; then