diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec
index 33f185bd25..91cdfb7f3d 100644
--- a/contrib/fedora/rpm/NetworkManager.spec
+++ b/contrib/fedora/rpm/NetworkManager.spec
@@ -30,6 +30,7 @@
 
 %global with_adsl 1
 %global with_bluetooth 1
+%global with_wifi 1
 %global with_wimax 0
 %global with_wwan 1
 
@@ -173,6 +174,18 @@ This package contains NetworkManager support for Bluetooth devices.
 %endif
 
 
+%if 0%{?with_wifi}
+%package wifi
+Summary: Wifi plugin for NetworkManager
+Group: System Environment/Base
+Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
+Obsoletes: NetworkManager < 1:0.9.9.1-2
+
+%description wifi
+This package contains NetworkManager support for Wifi and OLPC devices.
+%endif
+
+
 %if 0%{?with_wwan}
 %package wwan
 Summary: Mobile broadband device plugin for NetworkManager
@@ -448,6 +461,14 @@ fi
 %exclude %{_libdir}/%{name}/libnm-device-plugin-bluetooth.so
 %endif
 
+%if 0%{?with_wifi}
+%files wifi
+%defattr(-,root,root,0755)
+%{_libdir}/%{name}/libnm-device-plugin-wifi.so
+%else
+%exclude %{_libdir}/%{name}/libnm-device-plugin-wifi.so
+%endif
+
 %if 0%{?with_wwan}
 %files wwan
 %defattr(-,root,root,0755)