diff --git a/templates/sudo-Makefile-in.diff b/templates/sudo-Makefile-in.diff
deleted file mode 100644
index 06def20d4e5..00000000000
--- a/templates/sudo-Makefile-in.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- Makefile.in.orig	2008-06-22 22:29:03.000000000 +0200
-+++ Makefile.in	2008-10-08 07:00:50.000000000 +0200
-@@ -41,7 +41,7 @@
- INSTALL = $(SHELL) $(srcdir)/install-sh -c
- 
- # Libraries
--LIBS = @LIBS@
-+LIBS = @LIBS@ -lutil
- NET_LIBS = @NET_LIBS@
- SUDO_LIBS = @SUDO_LIBS@ @AFS_LIBS@ @GETGROUPS_LIB@ $(LIBS) $(NET_LIBS)
- 
-@@ -188,7 +188,7 @@
- 	$(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $(srcdir)/sudo_noexec.c
- 
- sudo_noexec.la: sudo_noexec.lo
--	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ sudo_noexec.lo -avoid-version -rpath $(noexecdir)
-+	$(LIBTOOL) --mode=link $(CC) -module $(LDFLAGS) -o $@ sudo_noexec.lo -avoid-version -rpath $(noexecdir)
- 
- # Uncomment the following if you want "make distclean" to clean the parser
- @DEV@PARSESRCS = sudo.tab.h sudo.tab.c lex.yy.c def_data.c def_data.h
diff --git a/templates/sudo.tmpl b/templates/sudo.tmpl
index 9f18d656c44..60a1e4eae6f 100644
--- a/templates/sudo.tmpl
+++ b/templates/sudo.tmpl
@@ -1,15 +1,39 @@
 # Template build file for 'sudo'.
 pkgname=sudo
 version=1.6.9p17
-patch_files="$pkgname-Makefile-in.diff"
 distfiles="http://www.courtesan.com/sudo/dist/$pkgname-$version.tar.gz"
 build_style=gnu_configure
-configure_args="--disable-root-mailer"
+configure_args="--with-ignore-dot -with-all-insults --enable-shell-sets-home
+ --disable-root-sudo --with-logfac=auth -without-sendmail
+ --enable-noargs-shell"
 short_desc="Allow others to run commands as root"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=4d1a4bb3558ddeaa4c8c095067a5696afb6ea50a
+checksum=1e2cd4ff684c6f542b7e392010021f36b201d074620dad4d7689da60f9c74596
 long_desc="
  Sudo is a program designed to allow a sysadmin to give limited root
  privileges to users and log root activity. The basic philosophy is to
  give as few privileges as possible but still allow people to get their
  work done."
+
+conf_files="/etc/pam.d/sudo /etc/sudoers"
+build_depends="linux-pam-1.0.2"
+run_depends="glibc-2.8 $build_depends"
+
+post_install()
+{
+	local destdir=$XBPS_DESTDIR/$pkgname-$version
+
+	install -d $destdir/etc/pam.d
+	cat > $destdir/etc/pam.d/sudo <<_EOF
+auth        required        pam_unix.so
+account     required        pam_unix.so
+session     optional        pam_mail.so     dir=/var/mail standard
+session     optional	    pam_xauth.so
+session     required        pam_env.so
+session     required        pam_unix.so
+_EOF
+	chmod 644 $destdir/etc/pam.d/sudo
+	chmod 644 $destdir/usr/libexec/sudo/sudo_noexec.so
+	chmod 755 $destdir/usr/bin/sudo* $destdir/usr/sbin/visudo
+	chmod 644 $destdir/etc/sudoers
+}