diff --git a/libreoffice.changes b/libreoffice.changes
index 5721119..c8ef548 100644
--- a/libreoffice.changes
+++ b/libreoffice.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Wed Apr 11 07:47:35 UTC 2018 - tchvatal@suse.com
+
+- Provide and obsolete also libreoffice-branding-SLE
+
+-------------------------------------------------------------------
+Wed Apr 11 06:01:49 UTC 2018 - tchvatal@suse.com
+
+- Use pkgconfig(libpg) instead of posgresql-devel dependency
+
+-------------------------------------------------------------------
+Tue Apr 10 11:27:05 UTC 2018 - tchvatal@suse.com
+
+- Bring back offline help per popular demand as lto saves space
+  we could use with it bsc#915996
+
 -------------------------------------------------------------------
 Tue Apr 10 11:00:15 UTC 2018 - tchvatal@suse.com
 
diff --git a/libreoffice.spec b/libreoffice.spec
index 864a295..365d8ad 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -152,7 +152,6 @@ BuildRequires:  openldap2-devel
 BuildRequires:  pentaho-libxml
 BuildRequires:  pentaho-reporting-flow-engine
 BuildRequires:  pkgconfig
-BuildRequires:  postgresql-devel
 BuildRequires:  python3-xml
 BuildRequires:  sac
 BuildRequires:  ucpp
@@ -197,6 +196,7 @@ BuildRequires:  pkgconfig(libmwaw-0.3) >= 0.3.13
 BuildRequires:  pkgconfig(libodfgen-0.1) >= 0.1.4
 BuildRequires:  pkgconfig(liborcus-0.13)
 BuildRequires:  pkgconfig(libpagemaker-0.0)
+BuildRequires:  pkgconfig(libpq)
 BuildRequires:  pkgconfig(libqxp-0.0)
 BuildRequires:  pkgconfig(librevenge-0.0) >= 0.0.1
 BuildRequires:  pkgconfig(librsvg-2.0)
@@ -309,11 +309,13 @@ example:
 %package branding-upstream
 Summary:        Original Branding for LibreOffice
 Group:          Productivity/Office/Suite
-Supplements:    packageand(libreoffice:branding-upstream)
+Supplements:    libreoffice
 Conflicts:      libreoffice-branding
 Provides:       libreoffice-branding = %{version}
 Provides:       libreoffice-branding-openSUSE = 4.0.1
 Obsoletes:      libreoffice-branding-openSUSE < 4.0.1
+Provides:       libreoffice-branding-SLE = 4.0.1
+Obsoletes:      libreoffice-branding-SLE < 4.0.1
 BuildArch:      noarch
 
 %description branding-upstream
@@ -747,12 +749,13 @@ fi \
 # S:s: script classification (cjk, ctl). -S is only a marker, as it does
 #      not add any .xcd into the package (the file does not exist for at
 #      least one CTL-using locale, si)
+# T    has help files
 # Xx:  has autotext definitions
 #
 # Example:
 # libreoffice-l10n-cs: langpack for Czech lang. Requiring myspell-cs_CZ:
 # %%langpack -l cs -n Czech -m cs_CZ
-%define langpack(c:Ei:g:j:k:L:l:Mm:n:p:q:r:S:s:Xx:) \
+%define langpack(c:Ei:g:j:k:L:l:Mm:n:p:q:r:S:s:TXx:) \
 %define project LibreOffice \
 %define lang %{-l:%{-l*}}%{!-l:%{error:Language code not defined}} \
 %define _langpack_lang %{-L:%{-L*}}%{!-L:%{lang}} \
@@ -796,6 +799,10 @@ Obsoletes:      %{name}-help-%{-q*} < %{version} \
 Provides additional %{langname} translations and resources for %{project}. \
 \
 %files %{pkgname} \
+%{-T: \
+%dir %{_datadir}/libreoffice/help/%{_langpack_lang} \
+%{_datadir}/libreoffice/help/%{_langpack_lang} \
+}\
 %{!-E: \
 %define autotextdir %{_datadir}/%{name}/share/autotext \
 %dir %{autotextdir} \
@@ -809,73 +816,73 @@ Provides additional %{langname} translations and resources for %{project}. \
 %{expand:%%_link_noarch_files %{pkgname}} \
 %{nil}
 %langpack -l af -n Afrikaans -m af_ZA
-%langpack -l ar -n Arabic -s ctl -m ar
+%langpack -l ar -n Arabic -s ctl -m ar -T
 %langpack -l as -n Assamese
-%langpack -l bg -n Bulgarian -X -m bg_BG
-%langpack -l bn -n Bengali -m bn_BD
+%langpack -l bg -n Bulgarian -X -m bg_BG -T
+%langpack -l bn -n Bengali -m bn_BD -T
 %langpack -l br -n Breton -m br_FR
-%langpack -l ca -n Catalan -M -X
-%langpack -l cs -n Czech -X -m cs_CZ
+%langpack -l ca -n Catalan -M -X -T
+%langpack -l cs -n Czech -X -m cs_CZ -T
 %langpack -l cy -n Welsh
-%langpack -l da -n Danish -X -m da_DK
-%langpack -l de -n German -X -M
-%langpack -l dz -n Dzongkha -s ctl
-%langpack -l el -n Greek  -m el_GR
-%langpack -l en -n English -L en-US -X -p en-GB -q en-ZA -M  -g en_US
-%langpack -l eo -n Esperanto
-%langpack -l es -n Spanish -M -X
-%langpack -l et -n Estonian -m et_EE
-%langpack -l eu -n Basque
+%langpack -l da -n Danish -X -m da_DK -T
+%langpack -l de -n German -X -M -T
+%langpack -l dz -n Dzongkha -s ctl -T
+%langpack -l el -n Greek  -m el_GR -T
+%langpack -l en -n English -L en-US -X -p en-GB -q en-ZA -M  -g en_US -T
+%langpack -l eo -n Esperanto -T
+%langpack -l es -n Spanish -M -X -T
+%langpack -l et -n Estonian -m et_EE -T
+%langpack -l eu -n Basque -T
 %langpack -l fa -n Farsi -s ctl -X
-%langpack -l fi -n Finnish -r libreoffice-voikko -X
-%langpack -l fr -n French -X -m fr_FR
+%langpack -l fi -n Finnish -r libreoffice-voikko -X -T
+%langpack -l fr -n French -X -m fr_FR -T
 %langpack -l ga -n Irish
-%langpack -l gl -n Galician -M
-%langpack -l gu -n Gujarati -s ctl -p gu-IN -m gu_IN
-%langpack -l he -n Hebrew -s ctl -m he_IL
-%langpack -l hi -n Hindi -s ctl -p hi-IN -m hi_IN
-%langpack -l hr -n Croatian -m hr_HR -X
-%langpack -l hu -n Hungarian -X -m hu_HU
-%langpack -l it -n Italian -X -m it_IT
-%langpack -l ja -n Japanese -s cjk -X
+%langpack -l gl -n Galician -M -T
+%langpack -l gu -n Gujarati -s ctl -p gu-IN -m gu_IN -T
+%langpack -l he -n Hebrew -s ctl -m he_IL -T
+%langpack -l hi -n Hindi -s ctl -p hi-IN -m hi_IN -T
+%langpack -l hr -n Croatian -m hr_HR -X -T
+%langpack -l hu -n Hungarian -X -m hu_HU -T
+%langpack -l it -n Italian -X -m it_IT -T
+%langpack -l ja -n Japanese -s cjk -X -T
 %langpack -l kk -n Kazakh
 %langpack -l kn -n Kannada
-%langpack -l ko -n Korean -s cjk -X
-%langpack -l lt -n Lithuanian -m lt_LT -X
-%langpack -l lv -n Latvian -m lv_LV
+%langpack -l ko -n Korean -s cjk -X -T
+%langpack -l lt -n Lithuanian -m lt_LT -X -T
+%langpack -l lv -n Latvian -m lv_LV -T
 %langpack -l mai -n Maithili
 %langpack -l ml -n Malayalam
 %langpack -l mr -n Marathi
-%langpack -l nb -n Bokmal -M -m no
-%langpack -l nl -n Dutch -X -m nl_NL
-%langpack -l nn -n Nynorsk -m no
+%langpack -l nb -n Bokmal -M -m no -T
+%langpack -l nl -n Dutch -X -m nl_NL -T
+%langpack -l nn -n Nynorsk -m no -T
 %langpack -l nr -n Southern_Ndebele
 %langpack -l nso -n Northern_Sotho
 %langpack -l or -n Odia -s ctl
 %langpack -l pa -n Punjabi -s ctl -L pa-IN -p pa-IN -g pa_IN -j pa_IN
-%langpack -l pl -n Polish -X -m pl_PL
-%langpack -l pt_BR -n Brazilian_Portuguese -m pt_BR -L pt-BR -p pt-BR -X  -g pt_BR -j pt_BR
-%langpack -l pt_PT -n Portuguese -m pt_PT -L pt -x pt -p pt -q pt-PT
-%langpack -l ro -n Romanian -M -X
-%langpack -l ru -n Russian -X -m ru_RU
-%langpack -l si -n Sinhalese -S ctl -m si_LK
-%langpack -l sk -n Slovak -X -m sk_SK
-%langpack -l sl -n Slovenian -X -m sl_SI
+%langpack -l pl -n Polish -X -m pl_PL -T
+%langpack -l pt_BR -n Brazilian_Portuguese -m pt_BR -L pt-BR -p pt-BR -X  -g pt_BR -j pt_BR -T
+%langpack -l pt_PT -n Portuguese -m pt_PT -L pt -x pt -p pt -q pt-PT -T
+%langpack -l ro -n Romanian -M -X -T
+%langpack -l ru -n Russian -X -m ru_RU -T
+%langpack -l si -n Sinhalese -S ctl -m si_LK -T
+%langpack -l sk -n Slovak -X -m sk_SK -T
+%langpack -l sl -n Slovenian -X -m sl_SI -T
 %langpack -l sr -n Serbian -i sr-Latn -M -j sr_Latn -g sr -k sr@latin
 %langpack -l ss -n Swati
 %langpack -l st -n Southern_Sotho
-%langpack -l sv -n Swedish -X -m sv_SE
-%langpack -l ta -n Tamil -s ctl
+%langpack -l sv -n Swedish -X -m sv_SE -T
+%langpack -l ta -n Tamil -s ctl -T
 %langpack -l te -n Telugu -m te_IN
 %langpack -l th -n Thai -s ctl -c ctlseqcheck_th -m th_TH
 %langpack -l tn -n Tswana
-%langpack -l tr -n Turkish -X
+%langpack -l tr -n Turkish -X -T
 %langpack -l ts -n Tsonga
-%langpack -l uk -n Ukrainian -m uk_UA
+%langpack -l uk -n Ukrainian -m uk_UA -T
 %langpack -l ve -n Venda
 %langpack -l xh -n Xhosa
-%langpack -l zh_CN -n Simplified_Chinese -p zh-CN -s cjk -L zh-CN -x zh-CN -q zh-Hans  -g zh_CN -j zh_CN
-%langpack -l zh_TW -n Traditional_Chinese -p zh-TW -s cjk -L zh-TW -x zh-TW -q zh-Hant  -g zh_TW -j zh_TW
+%langpack -l zh_CN -n Simplified_Chinese -p zh-CN -s cjk -L zh-CN -x zh-CN -q zh-Hans  -g zh_CN -j zh_CN -T
+%langpack -l zh_TW -n Traditional_Chinese -p zh-TW -s cjk -L zh-TW -x zh-TW -q zh-Hant  -g zh_TW -j zh_TW -T
 %langpack -l zu -n Zulu -m zu_ZA
 
 %prep
@@ -991,8 +998,7 @@ export NOCONFIGURE=yes
         --with-external-dict-dir=%{_datadir}/hunspell \
         --with-external-hyph-dir=%{_datadir}/hyphen \
         --with-external-thes-dir=%{_datadir}/mythes \
-        --without-helppack-integration \
-        --without-help \
+        --with-help \
         --without-export-validation \
         --enable-odk \
 %if %{with kdeintegration}
@@ -1440,6 +1446,7 @@ exit 0
 %{_datadir}/%{name}/share/config/images_sifr.zip
 %{_datadir}/%{name}/share/config/images_sifr_dark.zip
 %{_datadir}/%{name}/share/config/images_tango.zip
+%{_datadir}/%{name}/share/config/images_helpimg.zip
 
 %files -f file-lists/branding_upstream.txt branding-upstream