diff --git a/python-networking-bigswitch.spec b/python-networking-bigswitch.spec
index a541db0252..9ea32b0626 100644
--- a/python-networking-bigswitch.spec
+++ b/python-networking-bigswitch.spec
@@ -6,7 +6,7 @@
 
 Name:           python-%{rpm_name}
 Version:        2015.3.12
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Big Switch Networks neutron plugin for OpenStack Networking
 License:        ASL 2.0
 URL:            https://pypi.python.org/pypi/%{pypi_name}
@@ -19,26 +19,29 @@ BuildRequires:  python-devel
 BuildRequires:  python-pbr
 BuildRequires:  python-setuptools
 BuildRequires:  python-sphinx
-BuildRequires:  systemd-units
+BuildRequires:  systemd
 
+%global _description\
+This package contains Big Switch Networks neutron plugins and agents
+
+%description %_description
+
+%package -n python2-%{rpm_name}
+Summary: %summary
 Requires:       python-pbr >= 0.10.8
 Requires:       python-oslo-log >= 1.0.0
 Requires:       python-oslo-config >= 2:1.9.3
 Requires:       python-oslo-utils >= 1.4.0
 Requires:       python-oslo-messaging >= 1.8.0
 Requires:       python-oslo-serialization >= 1.4.0
+%{?systemd_requires}
+%{?python_provide:%python_provide python2-%{rpm_name}}
 
-Requires(post):   systemd
-Requires(preun):  systemd
-Requires(postun): systemd
-
-%description
-This package contains Big Switch Networks
-neutron plugins and agents
+%description -n python2-%{rpm_name} %_description
 
 %package -n %{rpm_prefix}-agent
 Summary:        Neutron Big Switch Networks agent
-Requires:       python-%{rpm_name} = %{version}-%{release}
+Requires:       python2-%{rpm_name} = %{version}-%{release}
 
 %description -n %{rpm_prefix}-agent
 This package contains the Big Switch Networks
@@ -46,7 +49,7 @@ neutron agent for security groups.
 
 %package -n %{rpm_prefix}-lldp
 Summary:        Neutron Big Switch Networks LLDP service
-Requires:       python-%{rpm_name} = %{version}-%{release}
+Requires:       python2-%{rpm_name} = %{version}-%{release}
 
 %description -n %{rpm_prefix}-lldp
 This package contains the Big Switch Networks neutron LLDP agent.
@@ -80,7 +83,7 @@ for lib in %{lib_dir}/version.py %{lib_dir}/tests/test_server.py; do
     mv $lib.new $lib
 done
 
-%files
+%files -n python2-%{rpm_name}
 %license LICENSE
 %{python2_sitelib}/%{pypi_name}
 %{python2_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
@@ -103,19 +106,30 @@ done
 %doc README.rst
 %doc %{docpath}
 
-%post
+%post -n %{rpm_prefix}-agent
 %systemd_post neutron-bsn-agent.service
+
+%post -n %{rpm_prefix}-lldp
 %systemd_post neutron-bsn-lldp.service
 
-%preun
+%preun -n %{rpm_prefix}-agent
 %systemd_preun neutron-bsn-agent.service
+
+%preun -n %{rpm_prefix}-lldp
 %systemd_preun neutron-bsn-lldp.service
 
-%postun
+%postun -n %{rpm_prefix}-agent
 %systemd_postun_with_restart neutron-bsn-agent.service
+
+%postun -n %{rpm_prefix}-lldp
 %systemd_postun_with_restart neutron-bsn-lldp.service
 
 %changelog
+* Sun Dec 17 2017 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2015.3.12-3
+- Python 2 binary package renamed to python2-networking-bigswitch
+  See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3
+- Move the scriptlets to the package that holds the service file
+
 * Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2015.3.12-2
 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages