diff --git a/development/autotests/invertedTests b/development/autotests/invertedTests
index 1ad173ec73..8e0f6fb297 100644
--- a/development/autotests/invertedTests
+++ b/development/autotests/invertedTests
@@ -409,6 +409,8 @@ export/export/latex/languages/ja-listings-uncodable-error_docbook5
 export/export/latex/lyxbugs-resolved/9633-languagenesting_enumerate_and_lyxcode_docbook5
 export/export/xhtml/MissingEndTagDiv_docbook5
 export/export/xhtml/zh_CN_Tutorial_docbook5
+# - Formal groups do not work when there is (sample) text instead of real content.
+export/examples/Books/Tufte_Book_docbook5
 # - No proper document title (should be fixable).
 export/export/latex/inputenc-.*_docbook5
 export/export/latex/textcyr-textgreek-test_docbook5
@@ -426,10 +428,9 @@ export/mathmacros/masterOfSpace_docbook5
 #   - AASTeX.
 export/export/docbook/bibliography_precooked_aastex_docbook5
 #   - Springer. (The svmono_light should still pass.)
-export/templates/Books/Springer_Monographs_%28svmono%29/.*_docbook5
-export/export/docbook/svmono_docbook5
-export/templates/Books/Springer_Contributed_Books_%28svmult%29/.*_docbook5
-export/export/docbook/svmult_docbook5
+export/templates/Books/Springer.*/.*_docbook5
+!export/export/docbook/svmono_light_docbook5
+export/export/docbook/sv.*_docbook5
 #   - scrbook with too many customisations.
 export/templates/Theses/PhD_Thesis/.*_docbook5
 #   - Hollywood, too much formatting in elements DocBook does not allow to be formatted (like address).
@@ -447,6 +448,9 @@ export/templates/Letters/KOMA-Script_Letter_%28V._2%29_docbook5
 export/examples/Letters/Serial_Letter_.*_docbook5
 #   - DIN-Brief: order of paragraphs cannot match valid DocBook.
 export/templates/Letters/DIN-Brief_docbook5
+#   - AMS Book: order of elements is not compatible with DocBook (some parts must be in <info>, others cannot, while
+#     still being in the book's header).
+export/examples/Books/American_Mathematical_Society_%28AMS%29_docbook5
 # - Branches may cause problems (especially when mixing with parts that must go in <info>).
 export/export/latex/languages/supported-languages_(|babel|babel_auto-legacy|polyglossia)_?docbook5
 
diff --git a/lib/layouts/amsbook.layout b/lib/layouts/amsbook.layout
index fbbbf41de8..74c5a7ed6b 100644
--- a/lib/layouts/amsbook.layout
+++ b/lib/layouts/amsbook.layout
@@ -40,6 +40,7 @@ Style Standard
 	Align          Block
 	AlignPossible  Block, Left, Right, Center
 	LabelType      No_Label
+	DocBookTag     para
 End
 
 
@@ -171,4 +172,6 @@ Style Chapter_Exercises
 	    Color latex
 	  EndFont
 	EndArgument
+	DocBookTag       para
+	DocBookAttr      role='chapter-exercises'
 End
diff --git a/lib/layouts/amsdefs.inc b/lib/layouts/amsdefs.inc
index 2ae013a511..85132a15bc 100644
--- a/lib/layouts/amsdefs.inc
+++ b/lib/layouts/amsdefs.inc
@@ -48,6 +48,9 @@ Style Title
 	  Size                Larger
 	EndFont
 	HTMLTitle             true
+	DocBookTag            title
+	DocBookTagType        paragraph
+	DocBookInInfo         maybe
 End
 
 
@@ -68,6 +71,11 @@ Style Author
 	  Size                Large
 	  Shape               Smallcaps
 	EndFont
+	DocBookTag            personname
+	DocBookTagType        paragraph
+	DocBookWrapperTag     author
+	DocBookWrapperMergeWithPrevious true
+	DocBookInInfo         always
 End
 
 
@@ -92,6 +100,9 @@ Style Date
 	  Shape               Italic
 	  Size                Large
 	EndFont
+	DocBookTag            date
+	DocBookTagType        paragraph
+	DocBookInInfo         always
 End
 
 
@@ -139,6 +150,11 @@ Style Address
 	LabelFont
 	  Shape               Italic
 	EndFont
+	DocBookTag            address
+	DocBookTagType        paragraph
+	DocBookWrapperTag     author
+	DocBookWrapperMergeWithPrevious true
+	DocBookInInfo         always
 End
 
 
@@ -146,6 +162,10 @@ Style Current_Address
 	CopyStyle             Address
 	LatexName             curraddr
 	LabelString           "Current address:"
+	DocBookTag            address
+	DocBookTagType        paragraph
+	DocBookInInfo         always
+	DocBookAttr           role='current'
 End
 
 
@@ -154,6 +174,11 @@ Style Email
 	Margin                First_Dynamic
 	LatexName             email
 	LabelString           "E-mail address:"
+	DocBookTag            email
+	DocBookTagType        paragraph
+	DocBookWrapperTag     author
+	DocBookWrapperMergeWithPrevious true
+	DocBookInInfo         always
 End
 
 
@@ -162,6 +187,11 @@ Style URL
 	Margin                First_Dynamic
 	LatexName             urladdr
 	LabelString           "URL:"
+	DocBookTag            uri
+	DocBookTagType        paragraph
+	DocBookWrapperTag     author
+	DocBookWrapperMergeWithPrevious true
+	DocBookInInfo         always
 End
 
 
@@ -169,6 +199,11 @@ Style Keywords
 	CopyStyle             Address
 	LatexName             keywords
 	LabelString           "Key words and phrases:"
+	DocBookTag            keyword
+	DocBookTagType        paragraph
+	DocBookWrapperTag     keywordset
+	DocBookWrapperMergeWithPrevious true
+	DocBookInInfo         always
 End
 
 
@@ -176,6 +211,10 @@ Style Thanks
 	CopyStyle             Address
 	LatexName             thanks
 	LabelString           "Thanks:"
+	DocBookTag            para
+	DocBookWrapperTag     acknowledgements
+	DocBookWrapperMergeWithPrevious true
+	DocBookInInfo         never
 End
 
 
@@ -183,6 +222,10 @@ Style Dedicatory
 	CopyStyle             Address
 	LatexName             dedicatory
 	LabelString           "Dedication:"
+	DocBookTag            para
+	DocBookWrapperTag     dedication
+	DocBookWrapperMergeWithPrevious true
+	DocBookInInfo         never
 End
 
 
@@ -190,6 +233,12 @@ Style Translator
 	CopyStyle             Address
 	LatexName             translator
 	LabelString           "Translator:"
+	DocBookTag            personname
+	DocBookTagType        paragraph
+	DocBookWrapperTag     othercredit
+	DocBookWrapperAttr    role='translator'
+	DocBookWrapperMergeWithPrevious true
+	DocBookInInfo         always
 End
 
 
@@ -197,6 +246,13 @@ Style Subjectclass
 	CopyStyle             Address
 	LatexName             subjclass[2000]
 	LabelString           "2000 Mathematics Subject Classification:"
+	DocBookItemTag        subjectterm
+	DocBookItemTagType    inline
+	DocBookTag            subject
+	DocBookTagType        paragraph
+	DocBookWrapperTag     subjectset
+	DocBookWrapperMergeWithPrevious true
+	DocBookInInfo         always
 End