diff --git a/lib/ChangeLog b/lib/ChangeLog
index 241b08acad..72ed85e8cc 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,14 @@
+2005-04-14  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+	* layouts/scrclass.inc: do not assign a toclevel to addchap or
+	addsec. 
+
+	* layouts/numreport.inc: use data from numarticle.inc, so that
+	changes from article are obvious.
+
+	* layouts/numarticle.inc: add numbering stuff for Paragraph and
+	SubParagraph; set Part TocLevel to 0.
+
 2005-04-18  Martin Vermeer  <martin.vermeer@hut.fi>
 
 	* ui/stdtoolbars.ui:
diff --git a/lib/layouts/numarticle.inc b/lib/layouts/numarticle.inc
index 7c29c2c9dc..641cfbb7b7 100644
--- a/lib/layouts/numarticle.inc
+++ b/lib/layouts/numarticle.inc
@@ -1,10 +1,11 @@
 # Author : André Pönitz
-# This include files contains label definitions for a article-like numbering.
+# This include file contains label definitions for an article-like numbering.
 
 Style Part
 	LabelType             Counter
 	LabelCounter          part
 	LabelString           "Part \Roman{part}"
+	TocLevel              0
 End
 
 
@@ -36,10 +37,18 @@ End
 
 
 Style Paragraph
+	LabelType             Counter
+	LabelCounter          paragraph
+	LabelString           "@Subsubsection@.\arabic{paragraph}"
+	LabelStringAppendix   "@Subsubsection@.\arabic{paragraph}"
 	TocLevel              4
 End
 
 
 Style Subparagraph
+	LabelType             Counter
+	LabelCounter          subparagraph
+	LabelString           "@Paragraph@.\arabic{subparagraph}"
+	LabelStringAppendix   "@Paragraph@.\arabic{subparagraph}"
 	TocLevel              5
 End
diff --git a/lib/layouts/numreport.inc b/lib/layouts/numreport.inc
index 6d7b508533..c337987feb 100644
--- a/lib/layouts/numreport.inc
+++ b/lib/layouts/numreport.inc
@@ -1,10 +1,10 @@
 # Author : André Pönitz
-# This include files contains a label definitions for a report-like numbering.
+# This include file contains label definitions for a report-like numbering.
+
+Input numarticle.inc
 
 Style Part
-	LabelType             Counter
-	LabelCounter          part
-	LabelString           "Part \Roman{part}"
+	TocLevel              -1
 End
 
 
@@ -13,42 +13,12 @@ Style Chapter
 	LabelCounter          chapter
 	LabelString           "Chapter \arabic{chapter}"
 	LabelStringAppendix   "Appendix \Alph{chapter}"
-	TocLevel              1
+	TocLevel              0
 End
 
 
 Style Section
-	LabelType             Counter
-	LabelCounter          section
 	LabelString           "\arabic{chapter}.\arabic{section}"
 	LabelStringAppendix   "\Alph{chapter}.\arabic{section}"
-	TocLevel              2
 End
 
-
-Style Subsection
-	LabelType             Counter
-	LabelCounter          subsection
-	LabelString           "@Section@.\arabic{subsection}"
-	LabelStringAppendix   "@Section@.\arabic{subsection}"
-	TocLevel              3
-End
-
-
-Style Subsubsection
-	LabelType             Counter
-	LabelCounter          subsubsection
-	LabelString           "@Subsection@.\arabic{subsubsection}"
-	LabelStringAppendix   "@Subsection@.\arabic{subsubsection}"
-	TocLevel              4
-End
-
-
-Style Paragraph
-	TocLevel              5
-End
-
-
-Style Subparagraph
-	TocLevel              6
-End
diff --git a/lib/layouts/scrclass.inc b/lib/layouts/scrclass.inc
index 5f4d01a3e2..d7c054fcc3 100644
--- a/lib/layouts/scrclass.inc
+++ b/lib/layouts/scrclass.inc
@@ -109,14 +109,12 @@ End
 Style Addchap
 	CopyStyle             Chapter*
 	LatexName             addchap
-	TocLevel              1
 End
 
 
 Style Addsec
 	CopyStyle             Section*
 	LatexName             addsec
-	TocLevel              2
 End