diff --git a/bluez.changes b/bluez.changes
index e6ab5f1..a70db99 100644
--- a/bluez.changes
+++ b/bluez.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jun  8 06:54:26 UTC 2017 - seife+obs@b1-systems.com
+
+- add bluez-auto-enable-devices subpackage with main.conf which
+  auto-enables all devices (boo#1039476)
+
 -------------------------------------------------------------------
 Fri May 26 13:16:07 UTC 2017 - seife+obs@b1-systems.com
 
diff --git a/bluez.spec b/bluez.spec
index f43e011..621678d 100644
--- a/bluez.spec
+++ b/bluez.spec
@@ -111,6 +111,17 @@ Requires:       python-gobject2
 Contains a few tools for testing various bluetooth functions. The
 BLUETOOTH trademarks are owned by Bluetooth SIG, Inc., U.S.A.
 
+%package auto-enable-devices
+Summary:        Configuration that automatically enables all bluetooth devices
+License:        GPL-2.0+
+Group:          Hardware/Mobile
+BuildArch:      noarch
+
+%description auto-enable-devices
+Contains configuration that automatically enables all bluetooth devices
+that are connected to the system if no other tool is handling them (e.g.
+desktop specific applets like blueman or GNOME or KDE applets).
+
 %prep
 %setup -q
 %patch1 -p1
@@ -124,6 +135,9 @@ sed -i "s:Exec=/bin/false:Exec=%{_libexecdir}/bluetooth/obexd:g" obexd/src/org.b
 sed -i "/SystemdService=.*/d" obexd/src/org.bluez.obex.service
 # END FIXME
 
+# for auto-enable subpackage
+echo AutoEnable=true >> src/main.conf
+
 %build
 # because of patch4...
 autoreconf -fi
@@ -159,6 +173,10 @@ rm %{buildroot}%{_userunitdir}/obex.service
 # "make install" fails to install gatttool, used with Bluetooth Low Energy
 install -m0755 attrib/gatttool %{buildroot}%{_bindir}
 
+# for auto-enable subpackage
+find . -name main.conf
+install --mode 0644 -D src/main.conf %{buildroot}/%{_sysconfdir}/bluetooth/main.conf
+
 # rpmlint warnings...
 cd %{buildroot}%{_libdir}/bluez/test
 chmod 0644 *.py *.xml *.dtd
@@ -260,4 +278,9 @@ make check V=0
 %dir %{_libdir}/bluez
 %{_libdir}/bluez/test
 
+%files auto-enable-devices
+%defattr(-,root,root)
+%dir %{_sysconfdir}/bluetooth
+%config(noreplace) %{_sysconfdir}/bluetooth/main.conf
+
 %changelog