diff --git a/fuse.changes b/fuse.changes
index 06dc8c1..f12893c 100644
--- a/fuse.changes
+++ b/fuse.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Dec 10 21:08:32 UTC 2014 - bwiedemann@suse.com
+
+- include commented default fuse.conf (bnc#908292)
+
 -------------------------------------------------------------------
 Wed Jul 24 17:53:36 CEST 2013 - mszeredi@suse.cz
 
diff --git a/fuse.conf b/fuse.conf
new file mode 100644
index 0000000..2d252c0
--- /dev/null
+++ b/fuse.conf
@@ -0,0 +1,18 @@
+# The file /etc/fuse.conf allows for the following parameters:
+#
+# user_allow_other - Using the allow_other mount option works fine as root, in
+# order to have it work as user you need user_allow_other in /etc/fuse.conf as 
+# well. (This option allows users to use the allow_other option.) You need 
+# allow_other if you want users other than the owner to access a mounted fuse. 
+# This option must appear on a line by itself. There is no value, just the 
+# presence of the option.
+
+#user_allow_other
+
+
+# mount_max = n - this option sets the maximum number of mounts.
+# Currently (2014) it must be typed exactly as shown
+# (with a single space before and after the equals sign).
+
+#mount_max = 1000
+
diff --git a/fuse.spec b/fuse.spec
index 74fb58e..9dee335 100644
--- a/fuse.spec
+++ b/fuse.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package fuse
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -26,6 +26,7 @@ Release:        0
 Source:         http://downloads.sourceforge.net/project/fuse/fuse-2.X/%{version}/%{name}-%{version}.tar.gz
 Source2:        fuse.rpmlintrc
 Source3:        baselibs.conf
+Source4:        fuse.conf
 Patch:          fuse-install-fix.diff
 Patch3:         fusermount-compile-as-pie.patch
 Patch4:         aarch64-build-fix.patch
@@ -155,6 +156,7 @@ make %{?_smp_mflags}
 %install
 %makeinstall
 rm -rf $RPM_BUILD_ROOT/%{_sysconfdir}/init.d
+install -m644 -D %{S:4} $RPM_BUILD_ROOT/%{_sysconfdir}/fuse.conf
 # Needed for OpenSUSE buildservice
 %if %suse_version <= 1020
 install -m644 -D util/udev.rules $RPM_BUILD_ROOT/%{_sysconfdir}/udev/rules.d/99-fuse.rules
@@ -207,6 +209,7 @@ popd
 /sbin/mount.fuse
 #EndUsrMerge
 %{_sbindir}/mount.fuse
+%config %{_sysconfdir}/fuse.conf
 %{_bindir}/ulockmgr_server
 %{_mandir}/man1/fusermount.1.*
 %{_mandir}/man1/ulockmgr_server.1.*