Index: general.ent
===================================================================
--- general.ent	(revision 3f7259729266d3810ef1e36c6d7d12f4e91e5b55)
+++ general.ent	(revision a26f3f8fd38015bd1285921aba50cbaf68dd988f)
@@ -567,5 +567,5 @@
 <!ENTITY mysql-version                "5.5.17">
 <!ENTITY postgresql-version           "9.0.6">
-<!ENTITY sqlite-version               "3.7.10">
+<!ENTITY sqlite-version               "3.7.11">
 
 <!-- Chapter 22 -->
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 3f7259729266d3810ef1e36c6d7d12f4e91e5b55)
+++ introduction/welcome/changelog.xml	(revision a26f3f8fd38015bd1285921aba50cbaf68dd988f)
@@ -58,4 +58,7 @@
           <para>[dj] - Upate to keyutils-1.5.5.</para>
         </listitem>
+        <listitem>
+          <para>[abenton] - SQLite 3.7.11.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
Index: server/databases/sqlite.xml
===================================================================
--- server/databases/sqlite.xml	(revision 3f7259729266d3810ef1e36c6d7d12f4e91e5b55)
+++ server/databases/sqlite.xml	(revision a26f3f8fd38015bd1285921aba50cbaf68dd988f)
@@ -8,5 +8,5 @@
   <!ENTITY sqlite-download-http "http://sqlite.org/sqlite-autoconf-&sqlite-dl-version;.tar.gz">
   <!ENTITY sqlite-download-ftp  " ">
-  <!ENTITY sqlite-md5sum        "9ed2ca93577b58cfa0d01f64b9312ab9">
+  <!ENTITY sqlite-md5sum        "0552d71bda98ebdcaea305cd6058221b">
   <!ENTITY sqlite-size          "1.7 MB">
   <!ENTITY sqlite-buildsize     "46 MB (includes optional documentation)">
@@ -35,7 +35,9 @@
     <title>Introduction to SQLite</title>
 
-    <para>The <application>SQLite</application> package is a software
-    library that implements a self-contained, serverless,
-    zero-configuration, transactional SQL database engine.</para>
+    <para>
+      The <application>SQLite</application> package is a software library that
+      implements a self-contained, serverless, zero-configuration, transactional
+      SQL database engine.
+    </para>
 
     &lfs71_checked;
@@ -44,20 +46,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&sqlite-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&sqlite-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &sqlite-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &sqlite-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &sqlite-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &sqlite-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&sqlite-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&sqlite-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &sqlite-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &sqlite-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &sqlite-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &sqlite-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -67,11 +81,17 @@
       <title>Optional Documentation</title>
       <listitem>
-        <para>Download (HTTP): <ulink url="&sqlite-docs-download;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &sqlite-docs-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &sqlite-docs-size;</para>
+        <para>
+          Download (HTTP): <ulink url="&sqlite-docs-download;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &sqlite-docs-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &sqlite-docs-size;
+        </para>
       </listitem>
     </itemizedlist>
@@ -80,10 +100,11 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="unzip"/> (required to unzip the
-    documentation)</para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/sqlite"/></para>
-
+    <para role="optional">
+      <xref linkend="unzip"/> (required to unzip the documentation).
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/sqlite"/>
+    </para>
   </sect2>
 
@@ -91,11 +112,15 @@
     <title>Installation of SQLite</title>
 
-    <para>If you downloaded the optional documentation, issue the following
-    command to install the documentation into the source tree:</para>
+    <para>
+      If you downloaded the optional documentation, issue the following command
+      to install the documentation into the source tree:
+    </para>
 
 <screen><userinput>unzip -q ../sqlite-doc-&sqlite-dl-version;.zip</userinput></screen>
 
-    <para>Install <application>SQLite</application> by running the following
-    commands:</para>
+    <para>
+      Install <application>SQLite</application> by running the following
+      commands:
+    </para>
 
 <screen><userinput>./configure --prefix=/usr --disable-static \
@@ -103,13 +128,18 @@
 make</userinput></screen>
 
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      This package does not come with a test suite.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>make install</userinput></screen>
 
-    <para>If you downloaded the optional documentation, issue the following
-    commands as the <systemitem class="username">root</systemitem> user to
-    install it:</para>
+    <para>
+      If you downloaded the optional documentation, issue the following commands
+      as the <systemitem class="username">root</systemitem> user to install it:
+    </para>
 
 <screen role="root"><userinput>install -v -m755 -d /usr/share/doc/sqlite-&sqlite-version; &amp;&amp;
@@ -120,21 +150,23 @@
     <title>Command Explanations</title>
 
-    <para><parameter>CFLAGS="-g -O2 -DSQLITE_SECURE_DELETE
-    -DSQLITE_ENABLE_UNLOCK_NOTIFY=1"</parameter>: Applications such as
-    <application>firefox</application> require secure delete and enable unlock
-    notify to be turned on.  The only way to do this is to include them in the
-    CFLAGS.  By default, these are set to <literal>"-g -O2"</literal> so we
-    specify that to preserve those settings. You may, of course, wish to omit
-    the <literal>'-g'</literal> if you do not wish to create debugging
-    information.  For further information on what can be specified see <ulink
-    url="http://www.sqlite.org/compile.html"/>.</para>
-
-    <para><parameter>--disable-static</parameter>: This parameter stops it
-    installing a static version of libsqlite3.</para>
-
-    <para><option>-DSQLITE_ENABLE_COLUMN_METADATA</option> : include this in
-    the CFLAGS if you want to use this as a system version for
-    <xref linkend="libgda"/>.</para>
-
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>    
+
+    <para>
+      <parameter>CFLAGS="-g -O2 -DSQLITE_SECURE_DELETE
+      -DSQLITE_ENABLE_UNLOCK_NOTIFY=1"</parameter>: Applications such as
+      <application>Firefox</application> require secure delete and enable unlock
+      notify to be turned on. The only way to do this is to include them in the
+      CFLAGS. By default, these are set to <literal>"-g -O2"</literal> so we
+      specify that to preserve those settings. You may, of course, wish to omit
+      the <literal>'-g'</literal> if you do not wish to create debugging
+      information. For further information on what can be specified see
+      <ulink url="http://www.sqlite.org/compile.html"/>.
+    </para>
+
+    <para>
+      <option>-DSQLITE_ENABLE_COLUMN_METADATA</option>: Add this to the CFLAGS
+      if you want to use this as a system version for <xref linkend="libgda"/>.
+    </para>
   </sect2>
 
@@ -145,10 +177,8 @@
       <segtitle>Installed Program</segtitle>
       <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
         <seg>sqlite3</seg>
         <seg>libsqlite3.so</seg>
-        <seg>None</seg>
       </seglistitem>
     </segmentedlist>
@@ -162,7 +192,9 @@
         <term><command>sqlite3</command></term>
         <listitem>
-          <para>A terminal-based front-end to the <application>SQLite
-          </application> library that can evaluate queries interactively
-          and display the results.</para>
+          <para>
+            A terminal-based front-end to the <application>SQLite</application>
+            library that can evaluate queries interactively and display the
+            results.
+          </para>
           <indexterm zone="sqlite sqlite3">
             <primary sortas="b-sqlite3">sqlite3</primary>
@@ -174,6 +206,7 @@
         <term><filename class='libraryfile'>libsqlite3.so</filename></term>
         <listitem>
-          <para>Contains the <application>SQLite</application> API
-          functions.</para>
+          <para>
+            contains the <application>SQLite</application> API functions.
+          </para>
           <indexterm zone="sqlite libsqlite3">
             <primary sortas="c-libsqlite3">libsqlite3.so</primary>
Index: template/template.xml
===================================================================
--- template/template.xml	(revision 3f7259729266d3810ef1e36c6d7d12f4e91e5b55)
+++ template/template.xml	(revision a26f3f8fd38015bd1285921aba50cbaf68dd988f)
@@ -189,8 +189,6 @@
     <title>Command Explanations</title>
 
-    <para>
-      <option>--disable-static</option>: This prevents the installation of
-      static versions of the libraries.
-    </para>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>    
 
     <para>
