diff --git a/evolution.spec b/evolution.spec
index 3fc7d72..d8d9022 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -21,7 +21,6 @@
 %define libnotify_support 1
 %define libpst_support 1
 %define krb5_support 1
-%define nm_support 1
 
 %define evo_plugin_dir %{_libdir}/evolution/%{evo_base_version}/plugins
 
@@ -29,7 +28,7 @@
 
 Name: evolution
 Version: 2.91.91
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -61,6 +60,7 @@ Requires: gvfs
 ### Build Dependencies ###
 
 BuildRequires: GConf2-devel
+BuildRequires: NetworkManager-devel
 BuildRequires: atk-devel
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake >= 1.9
@@ -111,10 +111,6 @@ BuildRequires: krb5-devel
 #define krb5dir `pwd`/krb5-fakeprefix
 %endif
 
-%if %{nm_support}
-BuildRequires: NetworkManager-glib-devel
-%endif
-
 %if %{libnotify_support}
 BuildRequires: libnotify-devel
 %endif
@@ -165,6 +161,16 @@ Requires: bogofilter
 %description bogofilter
 This package contains the plugin to filter junk mail using Bogofilter.
 
+%package NetworkManager
+Group: Applications/Productivity
+Summary: NetworkManager plugin for Evolution
+Requires: %{name} = %{version}-%{release}
+Requires: NetworkManager
+
+%description NetworkManager
+This package contains the plugin to monitor network availability using
+NetworkManager.
+
 %package spamassassin
 Group: Applications/Productivity
 Summary: SpamAssassin plugin for Evolution
@@ -413,9 +419,20 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/evolution/%{evo_base_version}
 
 # Modules:
+# These must be listed individually because the NetworkManager
+# module is split off into a separate NetworkManager subpackage.
 %dir %{_libdir}/evolution
 %dir %{_libdir}/evolution/%{evo_base_version}
-%{_libdir}/evolution/%{evo_base_version}/modules
+%dir %{_libdir}/evolution/%{evo_base_version}/modules
+%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-addressbook.so
+%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-calendar.so
+%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-mail.so
+%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-mailto-handler.so
+%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-offline-alert.so
+%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-plugin-lib.so
+%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-plugin-manager.so
+%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-plugin-python.so
+%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-startup-wizard.so
 
 # Shared libraries:
 %{_libdir}/evolution/%{evo_base_version}/libcomposer.so.*
@@ -588,6 +605,10 @@ rm -rf $RPM_BUILD_ROOT
 %{evo_plugin_dir}/liborg-gnome-bogo-junk-plugin.so
 %{_sysconfdir}/gconf/schemas/bogo-junk-plugin.schemas
 
+%files NetworkManager
+%defattr(-, root, root)
+%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-network-manager.so
+
 %files spamassassin
 %defattr(-, root, root)
 %{evo_plugin_dir}/org-gnome-sa-junk-plugin.eplug
@@ -606,6 +627,11 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Fri Mar 11 2011 Matthew Barnes <mbarnes@redhat.com> - 2.91.91-2
+- Split off an evolution-NetworkManager subpackage containing the NM
+  integration module.  Users that choose to bypass NetworkManager can
+  uninstall this subpackage so Evolution doesn't insist it's offline.
+
 * Mon Mar 07 2011 Milan Crha <mcrha@redhat.com> - 2.91.91-1
 - Update to 2.91.91