Index: general.ent
===================================================================
--- general.ent	(revision 4591404f4f54326ad1d04f94e9e559216a0ec07d)
+++ general.ent	(revision fa29663dae984fa601211f658ed1a3edff73ea40)
@@ -979,5 +979,5 @@
 <!ENTITY gnumeric-version             "1.10.17">
 <!ENTITY gnucash-version              "2.4.10">
-<!ENTITY libreoffice-version          "3.5.4">
+<!ENTITY libreoffice-version          "3.6.0">
 
 <!-- <!ENTITY koffice-version              "1.6.3">
Index: general/genlib/boost.xml
===================================================================
--- general/genlib/boost.xml	(revision 4591404f4f54326ad1d04f94e9e559216a0ec07d)
+++ general/genlib/boost.xml	(revision fa29663dae984fa601211f658ed1a3edff73ea40)
@@ -31,6 +31,8 @@
 
     <para>
-      <application>Boost</application> provides free peer-reviewed
-      portable C++ source libraries.
+      <application>Boost</application> provides a set of free peer-reviewed
+      portable C++ source libraries. It includes libraries for linear algebra,
+      pseudorandom number generation, multithreading, image processing, regular
+      expressions and unit testing.
     </para>
 
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 4591404f4f54326ad1d04f94e9e559216a0ec07d)
+++ introduction/welcome/changelog.xml	(revision fa29663dae984fa601211f658ed1a3edff73ea40)
@@ -49,4 +49,7 @@
       <itemizedlist>
         <listitem>
+          <para>[rthomsen] - LibreOffice 3.6.0.</para>
+        </listitem>
+        <listitem>
           <para>[krejzi] - GnuTLS 3.0.22.</para>
         </listitem>
Index: kde/add/kdeadmin.xml
===================================================================
--- kde/add/kdeadmin.xml	(revision 4591404f4f54326ad1d04f94e9e559216a0ec07d)
+++ kde/add/kdeadmin.xml	(revision fa29663dae984fa601211f658ed1a3edff73ea40)
@@ -30,7 +30,8 @@
     <title>Introduction to Kdeadmin</title>
 
-    <para>This package provides several administration tools for <application>KDE
-    </application>. These include a tool for managing users, a cron command schedule editor,
-    a printer administration tool and a log file viewer.</para>
+    <para>This package provides several administration tools for
+    <application>KDE</application>. These include a tool for managing users,
+    a cron command schedule editor, a printer administration tool and a log
+    file viewer.</para>
 
     &lfs71_checked;
Index: xsoft/office/libreoffice.xml
===================================================================
--- xsoft/office/libreoffice.xml	(revision 4591404f4f54326ad1d04f94e9e559216a0ec07d)
+++ xsoft/office/libreoffice.xml	(revision fa29663dae984fa601211f658ed1a3edff73ea40)
@@ -6,13 +6,13 @@
 
   <!ENTITY libreoffice-core-download-http
-    "http://download.documentfoundation.org/libreoffice/src/&libreoffice-version;/libreoffice-core-&libreoffice-version;.2.tar.xz">
+    "http://download.documentfoundation.org/libreoffice/src/&libreoffice-version;/libreoffice-core-&libreoffice-version;.4.tar.xz">
   <!ENTITY libreoffice-core-download-ftp  " ">
-  <!ENTITY libreoffice-core-md5sum        "61afc900785dd7d071b96d9ab0af46f3">
-  <!ENTITY libreoffice-core-size          "99 MB">
-  <!ENTITY libreoffice-buildsize          "6.0 GB (345 MB installed)">
-  <!ENTITY libreoffice-time               "121 SBU">
+  <!ENTITY libreoffice-core-md5sum        "67cf97e86c75363238a371f64ef5f606">
+  <!ENTITY libreoffice-core-size          "102 MB">
+  <!ENTITY libreoffice-buildsize          "7.1 GB (446 MB installed)">
+  <!ENTITY libreoffice-time               "55 SBU">
 ]>
 
-<sect1 id="libreoffice" xreflabel="libreoffice-&libreoffice-version;.2">
+<sect1 id="libreoffice" xreflabel="libreoffice-&libreoffice-version;">
   <?dbhtml filename="libreoffice.html"?>
 
@@ -22,5 +22,5 @@
   </sect1info>
 
-  <title>libreoffice-&libreoffice-version;.2</title>
+  <title>libreoffice-&libreoffice-version;</title>
 
   <indexterm zone="libreoffice">
@@ -29,11 +29,10 @@
 
   <sect2 role="package">
-    <title>Introduction to Libre Office</title>
-
-    <para>
-      <application>Libre Office</application> is a collection of programs for
-      creating and editing office documents. It is largely compatible with
-      <application>Microsoft Office</application> and
-      <application>Open Office</application> on which it is based.
+    <title>Introduction to LibreOffice</title>
+
+    <para>
+      <application>LibreOffice</application> is a full-featured office suite.
+      It is largely compatible with <application>Microsoft Office</application>
+      and is descended from OpenOffice.org.
     </para>
 
@@ -74,5 +73,5 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Libre Office Dependencies</bridgehead>
+    <bridgehead renderas="sect3">LibreOffice Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
@@ -112,6 +111,7 @@
       <xref linkend="neon"/>,
       <xref linkend="nss"/>,
-      <xref linkend="openssl"/>,
-      <xref linkend="poppler"/> and
+      <!-- LibreOffice 3.6.0.4 doesn't build with current poppler, using internal version
+      <xref linkend="poppler"/>, -->
+      <xref linkend="openssl"/> and
       <xref linkend="redland"/>.
     </para>
@@ -134,9 +134,9 @@
 
   <sect2 role="installation">
-    <title>Installation of Libre Office</title>
+    <title>Installation of LibreOffice</title>
 
     <warning>
       <para>
-        Untaring the libreoffice-core-&libreoffice-version;.2 tarball as
+        Untaring the libreoffice-core-&libreoffice-version;.4 tarball as
         <systemitem class="username">root</systemitem> has the curious effect of
         changing the ownership of the <emphasis>parent</emphasis> directory
@@ -161,13 +161,13 @@
     </warning>
 
-<screen role="root"><userinput>tar -xf libreoffice-core-&libreoffice-version;.2.tar.xz --no-overwrite-dir &amp;&amp;
-cd libreoffice-core-&libreoffice-version;.2</userinput></screen>
-
-    <para>
-      Install <application>Libre Office</application> by running the following
+<screen role="root"><userinput>tar -xf libreoffice-core-&libreoffice-version;.4.tar.xz --no-overwrite-dir &amp;&amp;
+cd libreoffice-core-&libreoffice-version;.4</userinput></screen>
+
+    <para>
+      Install <application>LibreOffice</application> by running the following
       commands:
     </para>
 
-<screen><userinput>sed -i 's# ORBit-2.0##' configure.in &amp;&amp;
+<screen><userinput>patch -Np1 -i ../libreoffice-core-&libreoffice-version;.4-boost_fix-1.patch &amp;&amp;
 ./autogen.sh --prefix=/usr  \
   --disable-binfilter       \
@@ -188,6 +188,5 @@
   --with-system-neon        \
   --with-system-nss         \
-  --with-system-openssl     \
-  --with-system-poppler     \
+  --with-system-openssl     \<!--  - -with-system-poppler     \ -->
   --with-system-redland     \
   --with-system-zlib        \
@@ -233,9 +232,9 @@
 
     <para>
-      <command>sed -i 's# ORBit-2.0##' configure.in</command>: If you remove the
-      <option>--disable-gconf</option> configure will check for the deprecated
-      ORBit. This sed removes the check for ORBit.
-    </para>
-
+      <command>patch -Np1 -i
+      ../libreoffice-core-&libreoffice-version;.4-boost_fix-1.patch</command>:
+      Fixes linking to <application>Boost</application> 1.50.
+    </para>
+    
     <para>
       <option>--enable-gtk3</option>: Add this option if you've installed and
@@ -250,5 +249,5 @@
     <para>
       <option>--disable-binfilter</option>: These "binfilters" enable
-      <application>Libre Office</application> to open legacy
+      <application>LibreOffice</application> to open legacy
       <application>Star Office</application> format documents. Compiling
       <application>binfilter</application> requires
@@ -258,10 +257,10 @@
     <para>
       <option>--disable-gconf</option>: Remove this option if you want to
-      compile Libre Office with GConf support.
+      compile LibreOffice with GConf support.
     </para>
 
     <para>
       <option>--disable-mozilla</option>: This option stops
-      <application>Libre Office</application> trying to compile an old version
+      <application>LibreOffice</application> trying to compile an old version
       of <application>SeaMonkey</application>.
     </para>
@@ -270,13 +269,13 @@
       <option>--disable-odk</option>: This option disables installing the
       office development kit. Remove this option if you want to develop a
-      <application>Libre Office</application> based application.
+      <application>LibreOffice</application> based application.
     </para>
 
     <para>
       <option>--disable-postgresql-sdbc</option>: This option disables compiling
-      Libre Office with the ability to connect to a PostgreSQL database. If you
-      would like Libre Office to be able to connect to a PostgreSQL database
+      LibreOffice with the ability to connect to a PostgreSQL database. If you
+      would like LibreOffice to be able to connect to a PostgreSQL database
       remove this option. If you have installed PostgreSQL on your system and
-      would like Libre Office to use that rather than compile its own copy, add
+      would like LibreOffice to use that rather than compile its own copy, add
       the option <option>--with-system-postgresql</option>.
     </para>
@@ -284,5 +283,5 @@
     <para>
       <option>--with-system- ...</option>: These options prevent
-      <application>Libre Office</application> trying to compile its own
+      <application>LibreOffice</application> trying to compile its own
       versions of these dependencies. If you've not installed
       some of the dependencies, remove the corresponding option.
@@ -291,5 +290,5 @@
     <para>
       <option>--with-num-cpus=$(getconf _NPROCESSORS_ONLN)</option>: This option
-      tells <application>Libre Office</application> to use all your CPUs to
+      tells <application>LibreOffice</application> to use all your CPUs to
       compile in parallel and speed up the build.
     </para>
@@ -309,5 +308,5 @@
     <para>
       <option>--without-java</option>: This option compiles
-      <application>Libre Office</application> without
+      <application>LibreOffice</application> without
       <application>Java</application> support.
     </para>
@@ -330,5 +329,5 @@
       ../libreoffice-downloads</command>: this makes a backup copy
       of the downloaded files so you don't have to download them again if you
-      decide to recompile <application>Libre Office</application>. In that case,
+      decide to recompile <application>LibreOffice</application>. In that case,
       just start with:
       <command>mkdir src; cp ../libreoffice-downloads/* src</command>
@@ -339,6 +338,6 @@
       These commands create 6 simple shell scripts in
       <filename class="directory">/usr/bin</filename> that can be used to launch
-      <application>Libre Office</application> in its various forms. If you like
-      seeing the <application>Libre Office</application> splash screen, remove
+      <application>LibreOffice</application> in its various forms. If you like
+      seeing the <application>LibreOffice</application> splash screen, remove
       the "--nologo" option.
     </para>
@@ -359,5 +358,5 @@
 
   <sect2 role="configuration">
-    <title>Configuring Libre Office</title>
+    <title>Configuring LibreOffice</title>
 
     <para>
@@ -374,5 +373,5 @@
 Type=Application
 Name=${program^}
-Comment=Libre Office ${program^}
+Comment=LibreOffice ${program^}
 Icon=${program}
 Exec=${program}
@@ -385,5 +384,5 @@
 Type=Application
 Name=Printer Administration
-Comment=Libre Office Printer Administration
+Comment=LibreOffice Printer Administration
 Icon=printeradmin
 Exec=printeradmin
@@ -399,5 +398,5 @@
       <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
@@ -411,5 +410,5 @@
           writer.</seg>
         <seg>
-          Hundreds of shared libraries in
+          hundreds of shared libraries in
           <filename class="directory">/usr/lib/libreoffice</filename>.
         </seg>
@@ -501,5 +500,5 @@
         <listitem>
           <para>
-            is a tool to manage <application>Libre Office</application>
+            is a tool to manage <application>LibreOffice</application>
             extensions from the command line.
           </para>
