diff --git a/chapter05/cmake.xml b/chapter05/cmake.xml
index 650a2ea5e..296cd47d9 100644
--- a/chapter05/cmake.xml
+++ b/chapter05/cmake.xml
@@ -78,7 +78,8 @@
- Details on this package are located in TODO.
+ Details on this package are located in
+
diff --git a/chapter08/chapter08.xml b/chapter08/chapter08.xml
index 902d1bf48..ec32010c6 100644
--- a/chapter08/chapter08.xml
+++ b/chapter08/chapter08.xml
@@ -59,6 +59,7 @@
+
diff --git a/chapter08/cmake.xml b/chapter08/cmake.xml
new file mode 100644
index 000000000..d49fcc84b
--- /dev/null
+++ b/chapter08/cmake.xml
@@ -0,0 +1,139 @@
+
+
+ %general-entities;
+]>
+
+
+
+
+
+ cmake
+ &cmake-version;
+ &cmake-url;
+
+
+ CMake-&cmake-version;
+
+
+ CMake
+
+
+
+
+
+ The CMake package contains a modern toolset used for generating
+ Makefiles. It is a successor of the auto-generated configure script and
+ aims to be platform- and compiler-independent. A significant user of
+ CMake is LLVM.
+
+
+ &buildtime;
+ &diskspace;
+
+
+ &cmake-final-sbu;
+ &cmake-final-du;
+
+
+
+
+
+
+ Installation of CMake
+
+ Prevents applications using CMake from attempting to install files
+ into lib64:
+
+sed -i '/"lib64"/s/64//' Modules/GNUInstallDirs.cmake
+
+ Prepare CMake for compilation:
+
+./bootstrap --prefix=/usr --no-system-libs
+
+ Compile CMake by running:
+
+make
+
+ Install the package:
+
+make install
+
+
+
+
+ Contents of CMake
+
+
+ Installed Programs
+ Installed Directories
+
+
+
+ ccmake, cmake, cpack, and ctest
+
+
+ /usr/share/cmake-&cmake-majmin; and
+ /usr/share/doc/cmake-&cmake-version;
+
+
+
+
+
+ Short Descriptions
+
+
+
+
+ ccmake
+
+
+ is a curses based interactive frontend to
+ cmake
+
+
+ ccmake
+
+
+
+
+
+ cmake
+
+
+ is the makefile generator
+
+
+ cmake
+
+
+
+
+
+ cpack
+
+
+ is the CMake packaging program
+
+
+ cpack
+
+
+
+
+
+ ctest
+
+
+ is a testing utility for cmake-generated build trees
+
+
+ ctest
+
+
+
+
+
+
+
diff --git a/packages.ent b/packages.ent
index e6467f58c..853c230d3 100644
--- a/packages.ent
+++ b/packages.ent
@@ -112,6 +112,8 @@
+
+