diff --git a/jtag/doc/doc-layout.txt b/jtag/doc/doc-layout.txt
index 9d7a8ea9..99ec30e1 100644
--- a/jtag/doc/doc-layout.txt
+++ b/jtag/doc/doc-layout.txt
@@ -1,11 +1,37 @@
 <?xml version="1.0" standalone="no"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
          "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY datafilespecs SYSTEM "internals.xml">
+  <!ENTITY FDL SYSTEM "fdl.xml">
+  <!ENTITY GPL SYSTEM "gpl.dbk">
+  <!ENTITY LGPL SYSTEM "lgpl.dbk">
 ]>
 
 <book>
-<title>UrJTAG</title>
-<toc/>
+  <bookinfo>
+    <title>Universal JTAG library, server and tools</title>
+    <authorgroup>
+      <author><firstname>Kolja</firstname><surname>Waschk</surname></author>
+    </authorgroup>
+
+    <legalnotice>
+      <para>
+Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free
+Documentation License, Version 1.2 or any later version published by the Free
+Software Foundation. A copy of the license is included in the section entitled
+"GNU Free Documentation License".
+      </para>
+    </legalnotice>
+
+    <copyright>
+      <year>2007</year>
+      <year>2008</year>
+      <holder>Kolja Waschk and the respective authors</holder>
+    </copyright>
+
+  </bookinfo>
+
+  <toc/>
 
 <chapter><title>General</title>
 
@@ -13,6 +39,7 @@
   <section><title>Authors, contributors, ... thanks</title><para/></section>
   <section><title>Copyright/Licensing</title> <para/> <para/></section>
   <section><title>UrJTAG/openwince history</title> <para/> <para/></section>
+  <section><title>Supported hardware</title> <para/> <para/></section>
   <section><title>Installation </title><para/></section>
   <section><title>from binary tarball </title><para/></section>
   <section><title>from source tarball </title><para/></section>
@@ -41,7 +68,8 @@
   <section><title> Blackfin support (when available) </title><para/></section> 
 </chapter>
 
-<chapter><title> Internals </title>
+<chapter><title>Internals</title>
+
 
 <section><title> How to</title>
   <para>
@@ -92,13 +120,24 @@
     </title><para/></section>
 </chapter>
 
-<appendix><title> UrJTAG quick reference</title><para/> </appendix>
+&datafilespecs;
+
+<appendix><title>UrJTAG shell quick reference sheet</title><para/> </appendix>
+<appendix><title>man pages</title>
+  <section><title>jtag(1)</title><para/></section>
+  <section><title>bsdl2jtag(1)</title><para/></section>
+</appendix>
 
 <appendix><title> Exkurs: JTAG </title><para/></appendix>
 
-<appendix><title>UrJTAG Revision information</title><para/> </appendix>
+<appendix><title>UrJTAG Revision information</title><para/>
+  <section><title>UrJTAG 0.6</title><para/></section>
+  <section><title>openwince JTAG Tools 0.5.1</title><para/></section>
+</appendix>
 
-<appendix><title>UrJTAG Licenses</title><para/> </appendix>
+&FDL;
+&GPL;
+&LGPL;
 
 </book>
 
diff --git a/jtag/doc/internals.xml b/jtag/doc/internals.xml
index 0dabf0d5..20b544ee 100644
--- a/jtag/doc/internals.xml
+++ b/jtag/doc/internals.xml
@@ -1,18 +1,7 @@
 <!-- $Id$ -->
 
-<chapter>
-<chapterinfo>
-	<title>JTAG Tools Internals</title>
-</chapterinfo>
-
-<para>
-This chapter is primarily intented for JTAG Tools hackers.
-</para>
-
-<sect1>
-<sect1info>
+<appendix>
 	<title>JTAG Declarations Files</title>
-</sect1info>
 
 <para>
 JTAG declarations files are located in directory <filename>data</filename>. The files contains
@@ -24,10 +13,8 @@ scan register, list of JTAG registers, etc.
 Syntax of the JTAG declaration file is defined in the following subsections.
 </para>
 
-<sect2>
-<sect2info>
+<section>
 	<title>General rules</title>
-</sect2info>
 
 <para>
 JTAG declaration file is text file which consists of lines. Empty lines are ignored. Text after
@@ -39,12 +26,10 @@ All other lines are significant.
 Each significant line consists of tokens separated by whitespace. Whitespace could be spaces and/or tabs.
 </para>
 
-</sect2>
+</section>
 
-<sect2>
-<sect2info>
+<section>
 	<title>Signal Definition</title>
-</sect2info>
 
 <para>
 Signal definition line consists of word <constant>signal</constant> followed by whitespace and signal name
@@ -52,8 +37,7 @@ Signal definition line consists of word <constant>signal</constant> followed by
 of the part. This list is currently not used for any purpose in JTAG Tools. It is intended for future use.
 </para>
 
-</sect2>
+</section>
 
-</sect1>
+</appendix>
 
-</chapter>