diff --git a/chapter08/jinja2.xml b/chapter08/jinja2.xml
new file mode 100644
index 000000000..4e9adaf72
--- /dev/null
+++ b/chapter08/jinja2.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-jinja2" role="wrap" revision="systemd">
+  <?dbhtml filename="jinja2.html"?>
+
+  <sect1info condition="script">
+    <productname>jinja2</productname>
+    <productnumber>&jinja2-version;</productnumber>
+    <address>&jinja2-url;</address>
+  </sect1info>
+
+  <title>Jinja2-&jinja2-version;</title>
+
+  <indexterm zone="ch-system-jinja2">
+    <primary sortas="a-jinja2">Jinja2</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
+
+    <para>Jinja2 is a Python module that implements a simple pythonic template
+    lanuage.</para>
+
+    <segmentedlist>
+      <segtitle>&buildtime;</segtitle>
+      <segtitle>&diskspace;</segtitle>
+      <seglistitem>
+        <seg>&jinja2-fin-sbu;</seg>
+        <seg>&jinja2-fin-du;</seg>
+      </seglistitem>
+    </segmentedlist>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Jinja2</title>
+
+    <para>Install the package:</para>
+
+<screen><userinput remap="install">python3 setup.py install --optimize=1</userinput></screen>
+
+  </sect2>
+
+  <sect2 id="contents-jinja2" role="content">
+    <title>Contents of Jinja2</title>
+
+    <segmentedlist>
+      <segtitle>Installed directories</segtitle>
+
+      <seglistitem>
+        <seg>/usr/lib/python&python-minor;/site-packages/Jinja2-&jinja2-version;-py&python-minor;.egg-info and /usr/lib/python&python-minor;/site-packages/Jinja2</seg>
+      </seglistitem>
+    </segmentedlist>
+
+  </sect2>
+
+</sect1>
+
diff --git a/chapter08/markupsafe.xml b/chapter08/markupsafe.xml
new file mode 100644
index 000000000..b75760e2a
--- /dev/null
+++ b/chapter08/markupsafe.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-markupsafe" role="wrap" revision="systemd">
+  <?dbhtml filename="markupsafe.html"?>
+
+  <sect1info condition="script">
+    <productname>markupsafe</productname>
+    <productnumber>&markupsafe-version;</productnumber>
+    <address>&markupsafe-url;</address>
+  </sect1info>
+
+  <title>MarkupSafe-&markupsafe-version;</title>
+
+  <indexterm zone="ch-system-markupsafe">
+    <primary sortas="a-markupsafe">MarkupSafe</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
+
+    <para>MarkupSafe is a Python module that implements a XML/HTML/XHTML Markup
+    safe string.</para>
+
+    <segmentedlist>
+      <segtitle>&buildtime;</segtitle>
+      <segtitle>&diskspace;</segtitle>
+      <seglistitem>
+        <seg>&markupsafe-fin-sbu;</seg>
+        <seg>&markupsafe-fin-du;</seg>
+      </seglistitem>
+    </segmentedlist>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of MarkupSafe</title>
+
+    <para>Compile MarkupSafe with the following command:</para>
+
+<screen><userinput remap="make">python3 setup.py build</userinput></screen>
+
+    <para>This package does not come with a test suite.</para>
+
+    <para>Install the package:</para>
+
+<screen><userinput remap="install">python3 setup.py install --optimize=1</userinput></screen>
+
+  </sect2>
+
+  <sect2 id="contents-markupsafe" role="content">
+    <title>Contents of MarkupSafe</title>
+
+    <segmentedlist>
+      <segtitle>Installed directory</segtitle>
+
+      <seglistitem>
+        <seg>/usr/lib/python&python-minor;/site-packages/MarkupSafe-&markupsafe-version;-py&python-minor;.egg-info and /usr/lib/python&python-minor;/site-packages/markupsafe</seg>
+      </seglistitem>
+    </segmentedlist>
+
+  </sect2>
+
+</sect1>
+