diff --git a/.gitignore b/.gitignore
index eebc928a..9e877e4e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,6 +23,7 @@ libtool
 *-glue.h
 *.tar.bz2
 org.freedesktop.ModemManager.service
+org.freedesktop.ModemManager.conf
 ModemManager.pc
 marshallers/mm-marshal.[ch]
 src/modem-manager
diff --git a/Makefile.am b/Makefile.am
index 13ecde66..7dde1432 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,6 +28,15 @@ endif
 dbusservicedir = $(DBUS_SYS_DIR)
 dbusservice_DATA = org.freedesktop.ModemManager.conf
 
+dbusservice_file_polkit = org.freedesktop.ModemManager.conf.polkit
+dbusservice_file_nopolkit = org.freedesktop.ModemManager.conf.nopolkit
+
+if WITH_POLKIT
+	cp -f $(top_srcdir)/$(dbusservice_file_polkit) $(dbusservice_DATA)
+else
+	cp -f $(top_srcdir)/$(dbusservice_file_nopolkit) $(dbusservice_DATA)
+endif
+
 dbusactivationdir = $(datadir)/dbus-1/system-services
 dbusactivation_in_files = org.freedesktop.ModemManager.service.in
 dbusactivation_DATA = $(dbusactivation_in_files:.service.in=.service)
@@ -57,8 +66,9 @@ DISTCLEANFILES = \
 
 EXTRA_DIST = \
 	doc-generator.xsl \
-	$(dbusservice_DATA) \
 	$(dbusactivation_in_files) \
-	$(INTLTOOL_FILES)
+	$(INTLTOOL_FILES) \
+	$(dbusservice_file_polkit) \
+	$(dbusservice_file_nopolkit)
 
 ACLOCAL_AMFLAGS = -I m4
diff --git a/org.freedesktop.ModemManager.conf.nopolkit b/org.freedesktop.ModemManager.conf.nopolkit
new file mode 100644
index 00000000..2f331613
--- /dev/null
+++ b/org.freedesktop.ModemManager.conf.nopolkit
@@ -0,0 +1,17 @@
+<!DOCTYPE busconfig PUBLIC
+ "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+  <!-- This config allows anyone to control ModemManager -->
+
+  <policy context="default">
+    <allow send_destination="org.freedesktop.ModemManager"/>
+  </policy>
+
+  <policy user="root">
+    <allow own="org.freedesktop.ModemManager"/>
+  </policy>
+
+  <limit name="max_replies_per_connection">512</limit>
+</busconfig>
+
diff --git a/org.freedesktop.ModemManager.conf b/org.freedesktop.ModemManager.conf.polkit
similarity index 100%
rename from org.freedesktop.ModemManager.conf
rename to org.freedesktop.ModemManager.conf.polkit