diff --git a/src/documentation/haiku_book/Jamfile b/src/documentation/haiku_book/Jamfile
index 8fc0d2d19a..cd8b807227 100644
--- a/src/documentation/haiku_book/Jamfile
+++ b/src/documentation/haiku_book/Jamfile
@@ -7,6 +7,11 @@ Doc2HTML
 	: Haiku_Book
 	;
 
+rule FRelGristFiles 
+{
+	return $(<:G=$(SOURCE_GRIST:E)$(>:J=!)) ;
+}
+
 local chapter_files = appkit.xml
 devicekit.xml
 gamekit.xml
@@ -26,5 +31,9 @@ Includes [ FGristFiles Haiku_Book.xml ]
 SEARCH on [ FGristFiles $(chapter_files) ] = [ FDirName $(SUB_DIR) ] ;
 
 local app_files = intro.xml messaging.xml scripting.xml Application.xml ;
-Includes [ FGristFiles appkit.xml ] : [ FGristFiles $(app_files) ] ;
-SEARCH on [ FGristFiles $(app_files) ] = [ FDirName $(SUB_DIR) app ] ;
+Includes [ FGristFiles appkit.xml ] : [ FRelGristFiles $(app_files) : app ] ;
+SEARCH on [ FRelGristFiles $(app_files) : app ] = [ FDirName $(SUB_DIR) app ] ;
+
+local kern_files = intro.xml threads.xml ports.xml sems.xml ;
+Includes [ FGristFiles kernelkit.xml ] : [ FRelGristFiles $(kern_files) : kernel ] ;
+SEARCH on [ FRelGristFiles $(kern_files) : kernel ] = [ FDirName $(SUB_DIR) kernel ] ;
diff --git a/src/documentation/haiku_book/kernel/intro.xml b/src/documentation/haiku_book/kernel/intro.xml
new file mode 100644
index 0000000000..d25b52cbfc
--- /dev/null
+++ b/src/documentation/haiku_book/kernel/intro.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+
+]>
+
+<sect1 id="kernel-intro">
+<title>Introduction</title>
+
+<para>
+Kernel Kit is about classes needed to interact with the kernel. Information about it is available in several topics :
+</para>
+<itemizedlist>
+<listitem><para>
+<xref linkend="kern-threads"/> helps to perform tasks.
+</para></listitem>
+<listitem><para>
+<xref linkend="kern-ports"/> helps to communicate between threads.
+</para></listitem>
+<listitem><para>
+<xref linkend="kern-sems"/> helps to synchronize threads.
+</para></listitem>
+</itemizedlist>
+
+</sect1>
diff --git a/src/documentation/haiku_book/kernel/ports.xml b/src/documentation/haiku_book/kernel/ports.xml
new file mode 100644
index 0000000000..52c838ed29
--- /dev/null
+++ b/src/documentation/haiku_book/kernel/ports.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+
+]>
+
+<sect1 id="kern-ports">
+<title>Ports</title>
+
+</sect1>
diff --git a/src/documentation/haiku_book/kernel/sems.xml b/src/documentation/haiku_book/kernel/sems.xml
new file mode 100644
index 0000000000..0ea3911145
--- /dev/null
+++ b/src/documentation/haiku_book/kernel/sems.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+
+]>
+
+<sect1 id="kern-sems">
+<title>Semaphores</title>
+
+</sect1>
diff --git a/src/documentation/haiku_book/kernel/threads.xml b/src/documentation/haiku_book/kernel/threads.xml
new file mode 100644
index 0000000000..ee8cb0e79e
--- /dev/null
+++ b/src/documentation/haiku_book/kernel/threads.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+
+]>
+
+<sect1 id="kern-threads">
+<title>Threads</title>
+
+</sect1>
diff --git a/src/documentation/haiku_book/kernelkit.xml b/src/documentation/haiku_book/kernelkit.xml
index 59e15bbbee..e9cdeefc28 100644
--- a/src/documentation/haiku_book/kernelkit.xml
+++ b/src/documentation/haiku_book/kernelkit.xml
@@ -3,41 +3,10 @@
 <chapter id="st-kernelkit">
 <title>The Kernel Kit</title>
 
-<sect1>
-<title>Introduction</title>
-</sect1>
-
-<sect1>
-<title>Threads</title>
-</sect1>
-
-<sect1>
-<title>Semaphores</title>
-</sect1>
-
-<sect1>
-<title>Ports</title>
-</sect1>
-
-<sect1>
-<title>Areas</title>
-</sect1>
-
-<sect1>
-<title>Images</title>
-</sect1>
-
-<sect1>
-<title>System info</title>
-</sect1>
-
-<sect1>
-<title>Time</title>
-</sect1>
-
-<sect1>
-<title>Other</title>
-</sect1>
+<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"  href="kernel/intro.xml" />
+<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"  href="kernel/threads.xml" />
+<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"  href="kernel/ports.xml" />
+<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"  href="kernel/sems.xml" />
 
 </chapter>