diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec
index 9deafc9504..499fd03795 100644
--- a/contrib/fedora/rpm/NetworkManager.spec
+++ b/contrib/fedora/rpm/NetworkManager.spec
@@ -29,6 +29,10 @@
 %define systemd_dir %{_prefix}/lib/systemd/system
 %define udev_dir %{_prefix}/lib/udev
 
+%global with_atm 1
+%global with_bt 1
+%global with_wwan 1
+
 %if ! 0%{?rhel} && (! 0%{?fedora} || 0%{?fedora} < 20)
 %ifnarch s390 s390x
 # No wimax or bluetooth on s390
@@ -56,7 +60,7 @@ Source: __SOURCE1__
 Source1: NetworkManager.conf
 Source2: 00-server.conf
 
-#Patch1: some.patch
+#Patch1: 0001-some.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -83,6 +87,7 @@ Requires: dnsmasq
 Requires: udev
 Requires: iptables
 Obsoletes: dhcdbd
+Obsoletes: NetworkManager < 1:0.9.9.1-2
 
 Conflicts: NetworkManager-vpnc < 1:0.7.0.99-1
 Conflicts: NetworkManager-openvpn < 1:0.7.0.99-1
@@ -141,6 +146,43 @@ It manages ethernet, WiFi, mobile broadband (WWAN), and PPPoE devices, and
 provides VPN integration with a variety of different VPN services.
 
 
+%if 0%{?with_atm}
+%package atm
+Summary: ADSL device plugin for NetworkManager
+Group: System Environment/Base
+Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
+Obsoletes: NetworkManager < 1:0.9.9.1-2
+
+%description atm
+This package contains NetworkManager support for ADSL devices.
+%endif
+
+
+%if 0%{?with_bt}
+%package bt
+Summary: Bluetooth device plugin for NetworkManager
+Group: System Environment/Base
+Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
+Requires: NetworkManager-wwan
+Obsoletes: NetworkManager < 1:0.9.9.1-2
+
+%description bt
+This package contains NetworkManager support for Bluetooth devices.
+%endif
+
+
+%if 0%{?with_wwan}
+%package wwan
+Summary: Mobile broadband device plugin for NetworkManager
+Group: System Environment/Base
+Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
+Obsoletes: NetworkManager < 1:0.9.9.1-2
+
+%description wwan
+This package contains NetworkManager support for mobile broadband (3G) devices.
+%endif
+
+
 %if 0%{?with_wimax}
 %package wimax
 Summary: Intel WiMAX device support for NetworkManager
@@ -222,7 +264,7 @@ by nm-connection-editor and nm-applet in a non-graphical environment.
 %prep
 %setup -q -n NetworkManager-%{realversion}
 
-#%patch1 -p1 -b .some
+#%patch1 -p1 -b .0001-some.orig
 
 %build
 
@@ -386,6 +428,25 @@ fi
 %{systemd_dir}/network-online.target.wants/NetworkManager-wait-online.service
 %{_datadir}/doc/NetworkManager/examples/server.conf
 
+%if 0%{?with_atm}
+%files atm
+%defattr(-,root,root,0755)
+%{_libdir}/%{name}/libnm-device-plugin-atm.so
+%endif
+
+%if 0%{?with_bt}
+%files bt
+%defattr(-,root,root,0755)
+%{_libdir}/%{name}/libnm-device-plugin-bt.so
+%endif
+
+%if 0%{?with_wwan}
+%files wwan
+%defattr(-,root,root,0755)
+%{_libdir}/%{name}/libnm-device-plugin-wwan.so
+%{_libdir}/%{name}/libnm-wwan.so
+%endif
+
 %if 0%{?with_wimax}
 %files wimax
 %defattr(-,root,root,0755)