diff --git a/libreoffice.changes b/libreoffice.changes
index 3070b42..dbf5b34 100644
--- a/libreoffice.changes
+++ b/libreoffice.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Nov 21 07:56:22 UTC 2016 - tchvatal@suse.com
+
+- Introduce back scp2-user-config-suse.diff wrt bnc#1010654 as
+  otherwise user configs would disappear with maintenance update...
+
 -------------------------------------------------------------------
 Sun Nov  6 09:10:11 UTC 2016 - tchvatal@suse.com
 
diff --git a/libreoffice.spec b/libreoffice.spec
index 73db209..0192288 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -63,6 +63,9 @@ Source2004:     %{external_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
 Source2005:     %{external_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
 # PATCH-FIX-SUSE: disable really fragile test run on hsqldb
 Patch0:         disable-flaky-hsqldb-test.patch
+# change user config dir name from ~/.libreoffice/3 to ~/.libreoffice/3-suse
+# to avoid BerkleyDB incompatibility with the plain build
+Patch1:         scp2-user-config-suse.diff
 # correctly bootstrap python stuff with system python (deb#501028, bnc#90701)
 Patch3:         system-pyuno.diff
 # do not use the broken help; unopkg complained about it when registering extensions
@@ -924,6 +927,10 @@ Provides additional %{langname} translations and resources for %{project}. \
 %prep
 %setup -q -b1 -b2
 %patch0 -p1
+# The rename of the configdir is needed only on older than factory for compat
+%if 0%{?suse_version} < 1330
+%patch1
+%endif
 %patch3 -p1
 %patch4
 %patch5
diff --git a/scp2-user-config-suse.diff b/scp2-user-config-suse.diff
new file mode 100644
index 0000000..1d9f728
--- /dev/null
+++ b/scp2-user-config-suse.diff
@@ -0,0 +1,34 @@
+---
+ officecfg/registry/data/org/openoffice/Setup.xcu |    2 +-
+ scp2/source/ooo/common_brand.scp                 |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git officecfg/registry/data/org/openoffice/Setup.xcu officecfg/registry/data/org/openoffice/Setup.xcu
+index 8e18ca5..7c0b95d 100644
+--- officecfg/registry/data/org/openoffice/Setup.xcu
++++ officecfg/registry/data/org/openoffice/Setup.xcu
+@@ -788,7 +788,7 @@
+           <value>10</value>
+         </prop>
+         <prop oor:name="VersionIdentifiers">
+-          <value oor:separator=",">Libreoffice 3=libreoffice/3,Openofice.org 3=openoffice.org/3,OpenOffice.org 2=openoffice.org2,StarOffice 8=staroffice8,StarSuite 8=starsuite8</value>
++          <value oor:separator=",">Libreoffice 3=libreoffice/3-suse,Openofice.org 3=ooo3,OpenOffice.org 2=ooo-2.0,StarOffice 8=staroffice8,StarSuite 8=starsuite8</value>
+         </prop>
+         <node oor:name="MigrationSteps">
+           <node oor:name="Datasources" oor:op="replace">
+diff --git scp2/source/ooo/common_brand.scp scp2/source/ooo/common_brand.scp
+index 7bbf873..0b235a0 100644
+--- scp2/source/ooo/common_brand.scp
++++ scp2/source/ooo/common_brand.scp
+@@ -774,7 +774,7 @@ ProfileItem gid_Brand_Profileitem_Bootstrap_Userinstall
+   #elif defined MACOSX
+     Value = "$SYSUSERCONFIG/%ONEWORDPRODUCTNAME/%USERDIRPRODUCTVERSION";
+   #else
+-    Value = "$SYSUSERCONFIG/%LCONEWORDPRODUCTNAME/%USERDIRPRODUCTVERSION";
++    Value = "$SYSUSERCONFIG/%LCONEWORDPRODUCTNAME/%USERDIRPRODUCTVERSION-suse";
+   #endif
+ End
+ 
+-- 
+1.7.0.1
+