Index: xsoft/office/libreoffice-systemd.xml
===================================================================
--- xsoft/office/libreoffice-systemd.xml	(revision de851b77ceb6759d0410be41f5aa3278d6e8ece7)
+++ xsoft/office/libreoffice-systemd.xml	(revision 48160fd641bb9cfbc474c481a7fc9782fe2e6918)
@@ -8,21 +8,21 @@
 
   <!ENTITY libreoffice-core-download-http "&libreoffice-dl;/libreoffice-&libreoffice-dlversion;.tar.xz">
-  <!ENTITY libreoffice-core-md5sum        "86aa9cad125fec16c5cd1d9d964e1d20">
+  <!ENTITY libreoffice-core-md5sum        "a0c7f05fd2edb91e195adb2f4170d794">
   <!ENTITY libreoffice-core-size          "146 MB">
 
   <!ENTITY libreoffice-dict-download-http "&libreoffice-dl;/libreoffice-dictionaries-&libreoffice-dlversion;.tar.xz">
-  <!ENTITY libreoffice-dict-md5sum        "996ec400156194fe26d24ffbccbc5b7a">
+  <!ENTITY libreoffice-dict-md5sum        "be29bf16f618b49571a283ca89023d0a">
   <!ENTITY libreoffice-dict-size          "36 MB">
 
   <!ENTITY libreoffice-help-download-http "&libreoffice-dl;/libreoffice-help-&libreoffice-dlversion;.tar.xz">
-  <!ENTITY libreoffice-help-md5sum        "63a59a4c77a72856b47caf1871cfc48f">
+  <!ENTITY libreoffice-help-md5sum        "072a585981c9177e7930a193b357a4b2">
   <!ENTITY libreoffice-help-size          "1.8 MB">
 
   <!ENTITY libreoffice-translations-download-http "&libreoffice-dl;/libreoffice-translations-&libreoffice-dlversion;.tar.xz">
-  <!ENTITY libreoffice-translations-md5sum        "0236e56349006fc8fec8e7df749c13b1">
-  <!ENTITY libreoffice-translations-size          "121 MB">
-
-  <!ENTITY libreoffice-buildsize          "6.6 GB (570 MB installed)">
-  <!ENTITY libreoffice-time               "135 SBU">
+  <!ENTITY libreoffice-translations-md5sum        "5b735fd27b42af83cf83d483a5eb2b04">
+  <!ENTITY libreoffice-translations-size          "122 MB">
+
+  <!ENTITY libreoffice-buildsize          "8.3 GB (660 MB installed)">
+  <!ENTITY libreoffice-time               "220 SBU">
 ]>
 
@@ -240,6 +240,7 @@
     </para>
 
-    <para>There are many optional dependencies not listed here. They can be
-    found in <quote>download.lst</quote> (source directory).
+    <para>
+      There are many optional dependencies not listed here. They can be
+      found in <quote>download.lst</quote> in the source directory.
     </para>
 
@@ -253,11 +254,10 @@
 
     <para>
-      Unpack the dictionaries file and create symlinks to tarballs from the
-      source directory so they won't get downloaded again:
+      Create symlinks to tarballs from the source directory so they won't
+      get downloaded again:
     </para>
 
 <screen><userinput>install -dm755 external/tarballs &amp;&amp;
 
-tar -xf ../libreoffice-dictionaries-&libreoffice-dlversion;.tar.xz --no-overwrite-dir --strip-components=1 &amp;&amp;
 ln -sfv ../../../libreoffice-dictionaries-&libreoffice-dlversion;.tar.xz external/tarballs/ &amp;&amp;
 ln -sfv ../../../libreoffice-help-&libreoffice-dlversion;.tar.xz external/tarballs/</userinput></screen>
@@ -300,13 +300,10 @@
 sed -e "/gzip -f/d"   \
     -e "s|.1.gz|.1|g" \
-    -i bin/distro-install-desktop-integration        &amp;&amp;
-
-sed -e "/distro-install-file-lists/d" -i Makefile.in &amp;&amp;
-
-chmod -v +x bin/unpack-sources                       &amp;&amp;
-sed -e "s/target\.mk/langlist\.mk/"                \
-    -e "s/tar -xf/tar -x --strip-components=1 -f/" \
-    -e "/tar -x/s/lo_src_dir/start_dir/"           \
-    -i bin/unpack-sources                            &amp;&amp;
+    -i bin/distro-install-desktop-integration &amp;&amp;
+
+sed -e "/distro-install-file-lists/d" \
+    -i Makefile.in                            &amp;&amp;
+
+chmod -v +x bin/unpack-sources                &amp;&amp;
 
 ./autogen.sh --prefix=/usr               \
@@ -315,6 +312,8 @@
              --with-lang="en-US pt-BR"   \
              --with-help                 \
+             --with-myspell-dicts        \
              --with-alloc=system         \
              --without-java              \
+             --without-system-dicts      \
              --disable-gconf             \
              --disable-odk               \
@@ -374,15 +373,4 @@
                   /usr/share/appdata</userinput></screen>
 
-    <para>
-       If the dictionaries have been built, again as
-       <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>chown -cR 0:0 dictionaries/                                                  &amp;&amp;
-mkdir -pv /usr/lib/libreoffice/share/extensions/dict-en                      &amp;&amp;
-cp -rv    dictionaries/en/* /usr/lib/libreoffice/share/extensions/dict-en    &amp;&amp;
-mkdir -pv /usr/lib/libreoffice/share/extensions/dict-pt-BR                   &amp;&amp;
-cp -rv    dictionaries/pt_BR/* /usr/lib/libreoffice/share/extensions/dict-pt-BR</userinput></screen>
-
   </sect2>
 
@@ -392,6 +380,5 @@
     <para>
       <command>sed -e ...</command>: The first sed prevents compression of the
-      manual pages, the second one prevents install from failing, and
-      the third one fixes the unpack script.
+      manual pages and the second one prevents install from failing.
     </para>
 
@@ -425,6 +412,11 @@
 
     <para>
-      <parameter>--with-help</parameter>: This switch is used to build
-      the help files.
+      <parameter>--with-help</parameter>: This switch is used to enable
+      installation of the help files.
+    </para>
+
+    <para>
+      <parameter>--with-myspell-dicts</parameter>: This switch is used
+      to enable installation of the bundled dictionaries.
     </para>
 
@@ -433,4 +425,10 @@
       <application>LibreOffice</application> to use system allocator
       instead of the internal one.
+    </para>
+
+    <para>
+      <parameter>--without-system-dicts</parameter>: This switch is
+      used to ensure that the dictionaries installed by this
+      package are being used.
     </para>
 
