diff --git a/setup-additional-services b/setup-additional-services
deleted file mode 100644
index ea36e57..0000000
--- a/setup-additional-services
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# The remaining port numbers are not allocated by IANA
-#
-swat            901/tcp
diff --git a/setup.spec b/setup.spec
index 9aa6a07..7fb0b2d 100644
--- a/setup.spec
+++ b/setup.spec
@@ -1,18 +1,14 @@
-%define ianaetcver 2.20
 %define daemon_id 6
-
 Name:          setup
 Version:       1.1.28
-Release:       1mamba
+Release:       2mamba
 Summary:       A set of system configuration and setup files
 Group:         System/Configuration
 Vendor:        openmamba
 Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
-URL:           http://www.openmamba.org/packages.html
-Source0:       setup-%{version}.tar.bz2
-Source1:       http://www.sethwklein.net/projects/iana-etc/downloads/iana-etc-%{ianaetcver}.tar.bz2
-Source2:       setup-additional-services
+URL:           http://git.openmamba.org/openmamba/setup
+Source0:       http://gitlab.mambasoft.it/openmamba/setup.git/v%{version}/setup-%{version}.tar.bz2
 License:       GPL
 BuildArch:     noarch
 ## AUTOBUILDREQ-BEGIN
@@ -21,6 +17,7 @@ Requires(post):sed
 Requires(post):glibc
 Requires(post):/usr/sbin/useradd
 Requires:      /bin/hostname
+Requires:      iana-etc
 Provides:      /etc/profile.d
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 
@@ -29,19 +26,15 @@ The setup package contains a set of very important system configuration and setu
 You should install the setup package because you will find yourself using its many features for system administration.
 
 %prep
-%setup -q -a1
+%setup -q
 
 %build
-make -C iana-etc-%{ianaetcver}
+%make
 
 %install
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
 %makeinstall
 
-cat %{S:2} >> iana-etc-%{ianaetcver}/services
-install -D -m644 iana-etc-%{ianaetcver}/{protocols,services} \
-   %{buildroot}%{_sysconfdir}/
-
 %clean
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
 
@@ -96,11 +89,12 @@ fi
 %dir %{_sysconfdir}/profile.d
 %config(noreplace) %{_sysconfdir}/profile.d/*.csh
 %config(noreplace) %{_sysconfdir}/profile.d/*.sh
-%config %{_sysconfdir}/protocols
-%config %{_sysconfdir}/services
 %doc AUTHORS ChangeLog
 
 %changelog
+* Fri Mar 13 2015 Silvan Calarco <silvan.calarco@mambasoft.it> 1.1.28-2mamba
+- move in a separate package and require iana-etc
+
 * Sun Jun 29 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 1.1.28-1mamba
 - update to 1.1.28