diff --git a/libreoffice.changes b/libreoffice.changes
index 060757f..517fe46 100644
--- a/libreoffice.changes
+++ b/libreoffice.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Feb 14 12:20:48 UTC 2017 - tchvatal@suse.com
+
+- Fixup pyuno loading as it broke when we dropped the uno patch
+
 -------------------------------------------------------------------
 Sat Feb  4 00:46:52 UTC 2017 - zaitor@opensuse.org
 
diff --git a/libreoffice.spec b/libreoffice.spec
index 9c68554..8f66a75 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -1221,6 +1221,13 @@ done
 # Remove pointless readmes
 rm -rf %{buildroot}%{_libdir}/%{name}/readmes/
 
+# Prepare uno path detection, can't be patched in because it breaks tests
+echo "import sys, os" > uno.py
+echo "sys.path.append('%{baseinstdir}/program')" >> uno.py
+echo "os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:%{_libdir}/libreoffice/program/fundamentalrc')" >> uno.py
+cat %{buildroot}%{_libdir}/%{name}/program/uno.py >> uno.py
+cp uno.py %{buildroot}%{_libdir}/%{name}/program/uno.py
+
 # Generate python cache files
 %py3_compile %{buildroot}/%{_libdir}/libreoffice/program/
 %py3_compile %{buildroot}/%{_libdir}/libreoffice/share/extensions/
@@ -1249,8 +1256,10 @@ ln -s %{_libdir}/%{name}/program/liblibreofficekitgtk.so %{buildroot}%{_libdir}/
 mkdir -p %{buildroot}%{python3_sitelib}
 ln -s %{_libdir}/libreoffice/program/uno.py %{buildroot}%{python3_sitelib}/uno.py
 ln -s %{_libdir}/libreoffice/program/unohelper.py %{buildroot}%{python3_sitelib}/unohelper.py
+ln -s %{_libdir}/libreoffice/program/officehelper.py %{buildroot}%{python3_sitelib}/officehelper.py
 echo "%{python3_sitelib}/uno.py" >> file-lists/pyuno_list.txt
 echo "%{python3_sitelib}/unohelper.py" >> file-lists/pyuno_list.txt
+echo "%{python3_sitelib}/officehelper.py" >> file-lists/pyuno_list.txt
 
 # move glade catalog to system glade dir
 install -m 0755 -d %{buildroot}%{_datadir}/glade/catalogs