diff --git a/sudo-sudoers.conf b/sudo-sudoers.conf
index b16aca2..ef31ebb 100644
--- a/sudo-sudoers.conf
+++ b/sudo-sudoers.conf
@@ -10,10 +10,9 @@
 # User alias specification
 
 # Cmnd alias specification
-Cmnd_Alias DISTRO_CMD = /usr/bin/apt-get, /usr/bin/rpm, /usr/sbin/synaptic, /usr/bin/apt-cdrom, /opt/kde3/bin/mambapt, /usr/bin/smart
-Cmnd_Alias EXTRA_CMD = /usr/bin/updatechecker, /usr/sbin/activate
-Cmnd_Alias SYSADM_CMD = /usr/bin/kdesu_stub, /sbin/service, /sbin/chkconfig, \
-                        /opt/kde3/bin/guarddog
+Cmnd_Alias DISTRO_CMD = /usr/bin/rpm, /usr/bin/smart
+# Cmnd_Alias EXTRA_CMD =
+Cmnd_Alias SYSADM_CMD = /sbin/service, /sbin/chkconfig, /usr/sbin/ufw
 Cmnd_Alias SYSADM_CMD_PASSWD = /sbin/*, /usr/sbin/*, /bin/*, /usr/bin/*, /opt/kde/bin/*, /opt/kde3/bin/*
 
 # Defaults specification
@@ -31,6 +30,6 @@ root    ALL=(ALL) ALL
 %packager ALL = NOPASSWD: DISTRO_CMD
 %sysadmin ALL = NOPASSWD: DISTRO_CMD
 %sysadmin ALL = NOPASSWD: SYSADM_CMD
-%sysadmin ALL = NOPASSWD: EXTRA_CMD
+# %sysadmin ALL = NOPASSWD: EXTRA_CMD
 
 #includedir /etc/sudoers.d
diff --git a/sudo.spec b/sudo.spec
index 5aed96c..fbc1c6c 100644
--- a/sudo.spec
+++ b/sudo.spec
@@ -5,7 +5,7 @@
 
 Name:          sudo
 Version:       1.8.9p5
-Release:       1mamba
+Release:       2mamba
 Summary:       Allows restricted root access for specified users
 Group:         System/Tools
 Vendor:        openmamba
@@ -114,11 +114,13 @@ groupadd sysadmin -g %{sysadmin_groupid} 2>/dev/null || :
 exit 0
 
 %post
-/bin/chmod 0440 %{_sysconfdir}/sudoers || :
-grep mambapt %{_sysconfdir}/sudoers >/dev/null || \
-   sed -i "s|\(Cmnd_Alias DISTRO_CMD = .*\)|\1, /opt/kde3/bin/mambapt|" %{_sysconfdir}/sudoers
-grep "/etc/sudoers\.d" %{_sysconfdir}/sudoers >/dev/null || \
-   echo "#includedir /etc/sudoers.d" >> %{_sysconfdir}/sudoers
+if [ $1 -gt 1 ]; then
+   /bin/chmod 0440 %{_sysconfdir}/sudoers || :
+   grep guarddog %{_sysconfdir}/sudoers >/dev/null && \
+     sed -i "s|/opt/kde3/bin/guarddog|/usr/sbin/ufw|" %{_sysconfdir}/sudoers
+#grep "/etc/sudoers\.d" %{_sysconfdir}/sudoers >/dev/null || \
+#   echo "#includedir /etc/sudoers.d" >> %{_sysconfdir}/sudoers
+fi
 exit 0
 
 %files -f %{name}.lang
@@ -151,6 +153,9 @@ exit 0
 %doc ChangeLog README README.LDAP
 
 %changelog
+* Thu Jul 03 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 1.8.9p5-2mamba
+- /etc/sudoers: remove old programs and add ufw to SYSADM_CMD (to fix mambatray enable/disable)
+
 * Wed May 28 2014 Automatic Build System <autodist@mambasoft.it> 1.8.9p5-1mamba
 - automatic update by autodist