diff --git a/20-connectivity-fedora.conf b/20-connectivity-fedora.conf
new file mode 100644
index 0000000..7a31a4d
--- /dev/null
+++ b/20-connectivity-fedora.conf
@@ -0,0 +1,4 @@
+[connectivity]
+uri=http://fedoraproject.org/static/hotspot.txt
+response=OK
+
diff --git a/NetworkManager.spec b/NetworkManager.spec
index 9491cbf..34aa488 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -50,6 +50,7 @@ URL: http://www.gnome.org/projects/NetworkManager/
 Source: %{name}-%{realversion}%{snapshot}.tar.bz2
 Source1: NetworkManager.conf
 Source2: 00-server.conf
+Source3: 20-connectivity-fedora.conf
 
 Patch1: 0001-explain-dns1-dns2.patch
 Patch2: rh1023571-fix-crash-ifcfg-rh-reload.patch
@@ -256,6 +257,15 @@ Requires: dbus-glib-devel >= %{dbus_glib_version}
 This package contains the header and pkg-config files for development applications using
 NetworkManager functionality from applications that use glib.
 
+%package config-connectivity-fedora
+Summary: NetworkManager config file for connectivity checking via Fedora servers
+Group: System Environment/Base
+Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
+
+%description config-connectivity-fedora
+This adds a NetworkManager configuration file to enable connectivity checking
+via Fedora infrastructure.
+
 %package config-server
 Summary: NetworkManager config file for "server-like" defaults
 Group: System Environment/Base
@@ -427,6 +437,7 @@ make install DESTDIR=$RPM_BUILD_ROOT
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.d
 %{__cp} %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.d
+%{__cp} %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.d
 
 # create a VPN directory
 %{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/NetworkManager/VPN
@@ -570,6 +581,11 @@ fi
 %dir %{_datadir}/gtk-doc/html/libnm-util
 %{_datadir}/gtk-doc/html/libnm-util/*
 
+%files config-connectivity-fedora
+%defattr(-,root,root,0755)
+%dir %{_sysconfdir}/%{name}/conf.d
+%config %{_sysconfdir}/%{name}/conf.d/20-connectivity-fedora.conf
+
 %files config-server
 %defattr(-,root,root,0755)
 %dir %{_sysconfdir}/%{name}/conf.d