diff --git a/mailman.spec b/mailman.spec
index 9c0d8b8..00a8cbb 100644
--- a/mailman.spec
+++ b/mailman.spec
@@ -1,9 +1,10 @@
 %define mailman_uid 64910
 %define mailman_gid 64910
 %define nobody_gid 65013
+%define pkgver %(echo %version | tr _ -)
 
 Name:          mailman
-Version:       2.1.17
+Version:       2.1.18_1
 Release:       1mamba
 Summary:       Free software for managing electronic mail discussion and e-newsletter lists
 Group:         System/Servers
@@ -11,7 +12,7 @@ Vendor:        openmamba
 Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
 URL:           http://mailman.sourceforge.net
-Source0:       http://downloads.sourceforge.net/sourceforge/mailman/mailman-%{version}.tgz
+Source0:       http://downloads.sourceforge.net/sourceforge/mailman/mailman-%{pkgver}.tgz
 Source1:       %{name}-update_aliases.sh
 Source2:       %{name}-cron
 Source3:       %{name}-update_aliases_vmailmgr.sh
@@ -28,10 +29,12 @@ BuildRequires: glibc-devel
 BuildRequires: expect
 BuildRequires: libpython-devel
 BuildRequires: python
+BuildRequires: dnspython
 Requires(pre): expect >= 8.4.5
 Requires:      python >= 2.2.3
 Requires:      apache >= 2.0.45
 Requires:      vixie-cron >= 3.0.1
+Requires:      dnspython
 Requires:      mta
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 
@@ -43,7 +46,7 @@ Mailman is integrated with the web, making it easy for users to manage their acc
 Mailman supports built-in archiving, automatic bounce processing, content filtering, digest delivery, spam filters, and more.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{pkgver}
 #%patch0 -p1
 # FIXME: the following patch disables the confirmation url link in email
 #        so that some smtp server filters like smpt.fastwebnet.it don't 
@@ -199,6 +202,9 @@ exit 0
 #%doc README ACKNOWLEDGMENTS FAQ BUGS README.* TODO UPGRADING NEWS
 
 %changelog
+* Tue Jun 17 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 2.1.18_1-1mamba
+- update to 2.1.18_1
+
 * Mon Nov 25 2013 Automatic Build System <autodist@mambasoft.it> 2.1.17-1mamba
 - automatic version update by autodist