diff --git a/fedora/SPECS/crowdsec-firewall-bouncer.spec b/fedora/SPECS/crowdsec-firewall-bouncer.spec
new file mode 100644
index 0000000..141291f
--- /dev/null
+++ b/fedora/SPECS/crowdsec-firewall-bouncer.spec
@@ -0,0 +1,185 @@
+Name:      crowdsec-firewall-bouncer-iptables
+Version:   0.0.28
+Release:   1%{?dist}
+Summary:   Firewall bouncer for Crowdsec (iptables+ipset configuration)
+
+License:   MIT
+URL:       https://crowdsec.net
+Source0:   https://github.com/crowdsecurity/%{name}/archive/v%{version}.tar.gz
+Source1:   80-crowdsec-firewall-bouncer.preset
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires: make
+%{?fc33:BuildRequires: systemd-rpm-macros}
+
+Requires: gettext,iptables,ipset,ipset-libs
+
+%define debug_package %{nil}
+%define _build_id_links none 
+
+%global local_version v%{version}-%{release}-rpm
+%global name crowdsec-firewall-bouncer
+%global __mangle_shebangs_exclude_from /usr/bin/env
+
+%prep
+%setup -q -T -b 0 -n %{name}-%{version}
+
+%build
+BUILD_VERSION=%{local_version} make
+
+%install
+rm -rf %{buildroot}
+
+mkdir -p %{buildroot}%{_bindir}
+install -m 755 %{name} %{buildroot}%{_bindir}/%{name}
+# symlink for compatibility with old versions
+mkdir -p %{buildroot}/usr/sbin
+ln -s %{_bindir}/%{name} %{buildroot}/usr/sbin/%{name}
+
+mkdir -p %{buildroot}/etc/crowdsec/bouncers
+install -m 600 config/%{name}.yaml %{buildroot}/etc/crowdsec/bouncers/%{name}.yaml
+
+mkdir -p %{buildroot}/usr/lib/%{name}
+install -m 600 scripts/_bouncer.sh %{buildroot}/usr/lib/%{name}/_bouncer.sh
+
+mkdir -p %{buildroot}%{_unitdir}
+BIN=%{_bindir}/%{name} CFG=/etc/crowdsec/bouncers envsubst '$BIN $CFG' < config/%{name}.service | install -m 0644 /dev/stdin %{buildroot}%{_unitdir}/%{name}.service
+
+mkdir -p %{buildroot}%{_presetdir}
+install -D -m 644 %{SOURCE1} %{buildroot}%{_presetdir}/
+
+%clean
+rm -rf %{buildroot}
+
+%changelog
+* Tue Feb 16 2021 Manuel Sabban <manuel@crowdsec.net>
+- First initial packaging
+
+# ------------------------------------
+# iptables
+# ------------------------------------
+
+%description -n %{name}-iptables
+
+%files -n %{name}-iptables
+%defattr(-,root,root,-)
+%{_bindir}/%{name}
+/usr/lib/%{name}/_bouncer.sh
+%{_unitdir}/%{name}.service
+%config(noreplace) /etc/crowdsec/bouncers/%{name}.yaml
+%config(noreplace) %{_presetdir}/80-crowdsec-firewall-bouncer.preset
+
+%post -n %{name}-iptables
+systemctl daemon-reload
+
+. /usr/lib/%{name}/_bouncer.sh
+START=1
+
+if grep -q '${BACKEND}' "$CONFIG"; then
+  newconfig=$(BACKEND="iptables" envsubst '$BACKEND' < "$CONFIG")
+  echo "$newconfig" | install -m 0600 /dev/stdin "$CONFIG"
+fi
+
+if [ "$1" = "1" ]; then
+    if need_api_key; then
+        if ! set_api_key; then
+            START=0
+        fi
+    fi
+fi
+
+set_local_port
+
+%systemd_post %{name}.service
+
+if [ "$START" -eq 0 ]; then
+    echo "no api key was generated, you can generate one on your LAPI Server by running 'cscli bouncers add <bouncer_name>' and add it to '$CONFIG'" >&2
+else
+    %if 0%{?fc35}
+    systemctl enable "$SERVICE"
+    %endif
+    systemctl start "$SERVICE"
+fi
+
+echo "$BOUNCER has been successfully installed"
+
+%preun -n %{name}-iptables
+. /usr/lib/%{name}/_bouncer.sh
+
+if [ "$1" = "0" ]; then
+    systemctl stop "$SERVICE" || echo "cannot stop service"
+    systemctl disable "$SERVICE" || echo "cannot disable service"
+    delete_bouncer
+fi
+
+%postun -n %{name}-iptables
+if [ "$1" = "1" ]; then
+    systemctl restart %{name} || echo "cannot restart service"
+fi
+
+# ------------------------------------
+# nftables
+# ------------------------------------
+
+%package -n %{name}-nftables
+Summary:  Firewall bouncer for Crowdsec (nftables configuration)
+Requires: nftables,gettext
+
+%description -n %{name}-nftables
+
+%files -n %{name}-nftables
+%defattr(-,root,root,-)
+%{_bindir}/%{name}
+/usr/sbin/%{name}
+/usr/lib/%{name}/_bouncer.sh
+%{_unitdir}/%{name}.service
+%config(noreplace) /etc/crowdsec/bouncers/%{name}.yaml
+%config(noreplace) %{_presetdir}/80-crowdsec-firewall-bouncer.preset
+
+%post -n %{name}-nftables
+systemctl daemon-reload
+
+. /usr/lib/%{name}/_bouncer.sh
+START=1
+
+if grep -q '${BACKEND}' "$CONFIG"; then
+  newconfig=$(BACKEND="nftables" envsubst '$BACKEND' < "$CONFIG")
+  echo "$newconfig" | install -m 0600 /dev/stdin "$CONFIG"
+fi
+
+if [ "$1" = "1" ]; then
+    if need_api_key; then
+        if ! set_api_key; then
+            START=0
+        fi
+    fi
+fi
+
+set_local_port
+
+%systemd_post %{name}.service
+
+if [ "$START" -eq 0 ]; then
+    echo "no api key was generated, you can generate one on your LAPI Server by running 'cscli bouncers add <bouncer_name>' and add it to '$CONFIG'" >&2
+else
+    %if 0%{?fc35}
+    systemctl enable "$SERVICE"
+    %endif
+    systemctl start "$SERVICE"
+fi
+
+echo "$BOUNCER has been successfully installed"
+
+%preun -n %{name}-nftables
+. /usr/lib/%{name}/_bouncer.sh
+
+if [ "$1" = "0" ]; then
+    systemctl stop "$SERVICE" || echo "cannot stop service"
+    systemctl disable "$SERVICE" || echo "cannot disable service"
+    delete_bouncer
+fi
+
+%postun -n %{name}-nftables
+if [ "$1" = "1" ]; then
+    systemctl restart %{name} || echo "cannot restart service"
+fi
diff --git a/fedora/SPECS/crowdsec.spec b/fedora/SPECS/crowdsec.spec
index 4efdf82..26e318d 100644
--- a/fedora/SPECS/crowdsec.spec
+++ b/fedora/SPECS/crowdsec.spec
@@ -6,12 +6,15 @@ Summary:        Crowdsec - An open-source, lightweight agent to detect and respo
 
 License:        MIT
 URL:            https://crowdsec.net
-Source0:        https://github.com/crowdsecurity/%{name}/archive/v%(echo $VERSION).tar.gz
+Source0:        https://github.com/crowdsecurity/%{name}/archive/%{name}-release.tgz
 Source1:        80-%{name}.preset
 Patch0:         crowdsec.unit.patch
 Patch1:         user.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%define         debug_package %{nil}
+%define         _build_id_links none 
+
 BuildRequires:  systemd
 Requires: crontabs
 %{?fc33:BuildRequires: systemd-rpm-macros}
@@ -19,7 +22,6 @@ Requires: crontabs
 %{?fc35:BuildRequires: systemd-rpm-macros}
 %{?fc36:BuildRequires: systemd-rpm-macros}
 
-%define debug_package %{nil}
 
 %description
 
@@ -29,10 +31,10 @@ Requires: crontabs
 %global __mangle_shebangs_exclude_from /usr/bin/env
 
 %prep
-%setup -q -T -b 0
+%setup -q -T -b 0 -n %{name}-v%{version}
 
-%patch0
-%patch1
+%patch -P 0
+%patch -P 1
 
 %build
 sed -i "s#/usr/local/lib/crowdsec/plugins/#%{_libdir}/%{name}/plugins/#g" config/config.yaml