diff --git a/.gitignore b/.gitignore
index 04f884a..b244735 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /sudo-1.8.16.tar.gz
 /sudo-1.8.17p1.tar.gz
+/sudo-1.8.18b2.tar.gz
diff --git a/sources b/sources
index 9534406..05f1211 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-50a840a688ceb6fa3ab24fc0adf4fa23  sudo-1.8.17p1.tar.gz
+17c7ccada7659cb5877ede799d459540  sudo-1.8.18b2.tar.gz
diff --git a/sudo.spec b/sudo.spec
index b0a0802..950a36e 100644
--- a/sudo.spec
+++ b/sudo.spec
@@ -1,11 +1,11 @@
 Summary: Allows restricted root access for specified users
 Name: sudo
-Version: 1.8.17p1
+Version: 1.8.18b2
 Release: 1%{?dist}
 License: ISC
 Group: Applications/System
 URL: http://www.courtesan.com/sudo/
-Source0: http://www.courtesan.com/sudo/dist/sudo-%{version}.tar.gz
+Source0: http://www.courtesan.com/sudo/dist/beta/sudo-%{version}.tar.gz
 Source1: sudoers
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: /etc/pam.d/system-auth
@@ -73,6 +73,7 @@ export CFLAGS="$RPM_OPT_FLAGS $F_PIE" LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now"
         --sbindir=%{_sbindir} \
         --libdir=%{_libdir} \
         --docdir=%{_pkgdocdir} \
+        --disable-root-mailer \
         --with-logging=syslog \
         --with-logfac=authpriv \
         --with-pam \
@@ -194,6 +195,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libexecdir}/sudo/libsudo_util.so
 
 %changelog
+* Fri Aug 26 2016 Radovan Sroka <rsroka@redhat.com> 1.8.18b2-1
+- update to 1.8.18b2
+- added --disable-root-mailer as configure option
+  Resolves: rhbz#1324091
+
 * Fri Jun 24 2016 Daniel Kopecek <dkopecek@redhat.com> 1.8.17p1-1
 - update to 1.8.17p1
 - install the /var/db/sudo/lectured