diff --git a/docs/manual.xml.in b/docs/manual.xml.in
index 7e02a5ca..0a6c7073 100644
--- a/docs/manual.xml.in
+++ b/docs/manual.xml.in
@@ -3,19 +3,82 @@
 <!ENTITY % build.version SYSTEM "entities/version.ent">
 %build.version;
 
+<!-- Add translated specific definitions and snippets -->
+<!ENTITY % language-defs     SYSTEM "@LANG@/language-defs.ent">
+
+%language-defs;
+
+<!-- Fallback to English definitions and snippets (in case of missing translation) -->
+<!ENTITY % language-defs.default     SYSTEM "en/language-defs.ent">
+
+%language-defs.default;
+
+
+
 <!ENTITY bookinfo SYSTEM "@LANG@/bookinfo.xml">
 <!ENTITY preface SYSTEM "@LANG@/preface.xml">
 <!ENTITY getting.started SYSTEM "@LANG@/getting-started.xml">
-<!ENTITY smarty.for.designers SYSTEM "@LANG@/designers.xml">
-<!ENTITY smarty.for.programmers SYSTEM "@LANG@/programmers.xml">
-<!ENTITY appendixes SYSTEM "@LANG@/appendixes.xml">
+
+<!ENTITY language.basic.syntax        SYSTEM "@LANG@/designers/language-basic-syntax.xml">
+<!ENTITY language.variables           SYSTEM "@LANG@/designers/language-variables.xml">
+<!ENTITY language.modifiers           SYSTEM "@LANG@/designers/language-modifiers.xml">
+<!ENTITY language.combining.modifiers SYSTEM "@LANG@/designers/language-combining-modifiers.xml">
+<!ENTITY language.builtin.functions   SYSTEM "@LANG@/designers/language-builtin-functions.xml">
+<!ENTITY language.custom.functions    SYSTEM "@LANG@/designers/language-custom-functions.xml">
+<!ENTITY config.files                 SYSTEM "@LANG@/designers/config-files.xml">
+<!ENTITY chapter.debugging.console    SYSTEM "@LANG@/designers/chapter-debugging-console.xml">
+
+<!ENTITY smarty.constants  SYSTEM "@LANG@/programmers/smarty-constants.xml">
+<!ENTITY api.variables     SYSTEM "@LANG@/programmers/api-variables.xml">
+<!ENTITY api.functions     SYSTEM "@LANG@/programmers/api-functions.xml">
+<!ENTITY caching           SYSTEM "@LANG@/programmers/caching.xml">
+<!ENTITY advanced.features SYSTEM "@LANG@/programmers/advanced-features.xml">
+<!ENTITY plugins           SYSTEM "@LANG@/programmers/plugins.xml">
+
+<!ENTITY troubleshooting SYSTEM "@LANG@/appendixes/troubleshooting.xml">
+<!ENTITY tips            SYSTEM "@LANG@/appendixes/tips.xml">
+<!ENTITY resources       SYSTEM "@LANG@/appendixes/resources.xml">
+<!ENTITY bugs            SYSTEM "@LANG@/appendixes/bugs.xml">
+
 ]>
 
-<book id="index">
+
+<book id="manual" lang="@LANG@">
+ <title>&SMARTYManual;</title>
+
  &bookinfo;
  &preface;
  &getting.started;
- &smarty.for.designers;
- &smarty.for.programmers;
- &appendixes;
-</book>
\ No newline at end of file
+
+ <part id="smarty.for.designers">
+  <title>&SMARTYDesigners;</title>
+
+  &language.basic.syntax;
+  &language.variables;
+  &language.modifiers;
+  &language.combining.modifiers;
+  &language.builtin.functions;
+  &language.custom.functions;
+  &config.files;
+  &chapter.debugging.console;
+ </part>
+
+ <part id="smarty.for.programmers">
+  <title>&SMARTYProgrammers;</title>
+
+  &smarty.constants;
+  &api.variables;
+  &api.functions;
+  &caching;
+  &advanced.features;
+  &plugins;
+ </part>
+ 
+<part id="appendixes">
+ <title>&Appendixes;</title>
+ &troubleshooting;
+ &tips;
+ &resources;
+ &bugs;
+</part>
+</book>