diff --git a/archetype-common/src/site/markdown/internal.md b/archetype-common/src/site/markdown/internal.md
index 361da570..b06a57b6 100644
--- a/archetype-common/src/site/markdown/internal.md
+++ b/archetype-common/src/site/markdown/internal.md
@@ -1,3 +1,10 @@
+---
+title: Maven Archetype Internal Catalog
+author: 
+  - Hervé Boutemy
+date: 2010-04-06
+---
+
 <!--
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file
diff --git a/archetype-models/archetype-catalog/src/site/markdown/index.md b/archetype-models/archetype-catalog/src/site/markdown/index.md
index bc4119b5..e79d5fb8 100644
--- a/archetype-models/archetype-catalog/src/site/markdown/index.md
+++ b/archetype-models/archetype-catalog/src/site/markdown/index.md
@@ -1,3 +1,10 @@
+---
+title: Maven Archetype Catalog Model
+author: 
+  - Hervé Boutemy
+date: 2011-08-21
+---
+
 <!--
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file
diff --git a/archetype-models/archetype-descriptor/src/site/markdown/index.md b/archetype-models/archetype-descriptor/src/site/markdown/index.md
index 89db7fa2..263a7167 100644
--- a/archetype-models/archetype-descriptor/src/site/markdown/index.md
+++ b/archetype-models/archetype-descriptor/src/site/markdown/index.md
@@ -1,3 +1,10 @@
+---
+title: Maven Archetype Descriptor Model
+author: 
+  - Hervé Boutemy
+date: 2011-08-21
+---
+
 <!--
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file
diff --git a/archetype-packaging/src/site/markdown/archetype-packaging.md.vm b/archetype-packaging/src/site/markdown/archetype-packaging.md.vm
index efa2b103..c1e1fc29 100644
--- a/archetype-packaging/src/site/markdown/archetype-packaging.md.vm
+++ b/archetype-packaging/src/site/markdown/archetype-packaging.md.vm
@@ -1,3 +1,10 @@
+---
+title: Maven Archetype Packaging Reference
+author: 
+  - Hervé Boutemy
+date: 2018-02-24
+---
+
 <!--
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file
diff --git a/archetype-packaging/src/site/markdown/index.md.vm b/archetype-packaging/src/site/markdown/index.md.vm
index 911e5d21..9889de81 100644
--- a/archetype-packaging/src/site/markdown/index.md.vm
+++ b/archetype-packaging/src/site/markdown/index.md.vm
@@ -1,3 +1,10 @@
+---
+title: About
+author: 
+  - Hervé Boutemy
+date: 2011-08-28
+---
+
 <!--
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file
diff --git a/maven-archetype-plugin/src/site/markdown/advanced-usage.md b/maven-archetype-plugin/src/site/markdown/advanced-usage.md
index 3297bd78..ea5a6640 100644
--- a/maven-archetype-plugin/src/site/markdown/advanced-usage.md
+++ b/maven-archetype-plugin/src/site/markdown/advanced-usage.md
@@ -1,3 +1,10 @@
+---
+title: Advanced Usage
+author: 
+  - Raphaël Piéroni
+date: 2008
+---
+
 <!--
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file
diff --git a/maven-archetype-plugin/src/site/markdown/archetype-repository.md b/maven-archetype-plugin/src/site/markdown/archetype-repository.md
index 2ecf0779..4b5b508f 100644
--- a/maven-archetype-plugin/src/site/markdown/archetype-repository.md
+++ b/maven-archetype-plugin/src/site/markdown/archetype-repository.md
@@ -1,3 +1,10 @@
+---
+title: Archetype Repository
+author: 
+  - Robert Scholte
+date: 2017-04-01
+---
+
 <!--
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file
diff --git a/maven-archetype-plugin/src/site/markdown/examples/create-multi-module-project.md b/maven-archetype-plugin/src/site/markdown/examples/create-multi-module-project.md
index f83f6d76..d35b4778 100644
--- a/maven-archetype-plugin/src/site/markdown/examples/create-multi-module-project.md
+++ b/maven-archetype-plugin/src/site/markdown/examples/create-multi-module-project.md
@@ -1,3 +1,10 @@
+---
+title: Create an archetype from a multi-module project
+author: 
+  - Raphaël Piéroni
+date: 2011-09-30
+---
+
 <!--
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file
diff --git a/maven-archetype-plugin/src/site/markdown/examples/create-with-property-file.md b/maven-archetype-plugin/src/site/markdown/examples/create-with-property-file.md
index ec260a41..ea1c729e 100644
--- a/maven-archetype-plugin/src/site/markdown/examples/create-with-property-file.md
+++ b/maven-archetype-plugin/src/site/markdown/examples/create-with-property-file.md
@@ -1,3 +1,10 @@
+---
+title: Create an archetype with a property file
+author: 
+  - Raphaël Piéroni
+date: 2011-09-30
+---
+
 <!--
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file
diff --git a/maven-archetype-plugin/src/site/markdown/examples/generate-alternative-catalog.md b/maven-archetype-plugin/src/site/markdown/examples/generate-alternative-catalog.md
index 53b8c6f2..f1cd53d8 100644
--- a/maven-archetype-plugin/src/site/markdown/examples/generate-alternative-catalog.md
+++ b/maven-archetype-plugin/src/site/markdown/examples/generate-alternative-catalog.md
@@ -1,3 +1,10 @@
+---
+title: Generate project using an alternative catalog
+author: 
+  - Raphaël Piéroni
+date: 2010-09-11
+---
+
 <!--
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file
diff --git a/maven-archetype-plugin/src/site/markdown/examples/generate-batch.md b/maven-archetype-plugin/src/site/markdown/examples/generate-batch.md
index 32c6c65e..a10dabb5 100644
--- a/maven-archetype-plugin/src/site/markdown/examples/generate-batch.md
+++ b/maven-archetype-plugin/src/site/markdown/examples/generate-batch.md
@@ -1,3 +1,10 @@
+---
+title: Generate project in batch mode
+author: 
+  - Raphaël Piéroni
+date: 2011-09-30
+---
+
 <!--
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file
diff --git a/maven-archetype-plugin/src/site/markdown/index.md.vm b/maven-archetype-plugin/src/site/markdown/index.md.vm
index ff226722..4b7200e2 100644
--- a/maven-archetype-plugin/src/site/markdown/index.md.vm
+++ b/maven-archetype-plugin/src/site/markdown/index.md.vm
@@ -1,3 +1,11 @@
+---
+title: Introduction
+author: 
+  - Raphaël Piéroni
+  - Hervé Boutemy
+date: 2011-09-30
+---
+
 <!--
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file
diff --git a/maven-archetype-plugin/src/site/markdown/specification/archetype-catalog.md b/maven-archetype-plugin/src/site/markdown/specification/archetype-catalog.md
index a9767d86..2bcd20bd 100644
--- a/maven-archetype-plugin/src/site/markdown/specification/archetype-catalog.md
+++ b/maven-archetype-plugin/src/site/markdown/specification/archetype-catalog.md
@@ -1,3 +1,10 @@
+---
+title: Archetype Catalog
+author: 
+  - Raphaël Piéroni
+date: 2011-09-30
+---
+
 <!--
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file
diff --git a/maven-archetype-plugin/src/site/markdown/specification/archetype-metadata.md b/maven-archetype-plugin/src/site/markdown/specification/archetype-metadata.md
index 580bf429..6da8163e 100644
--- a/maven-archetype-plugin/src/site/markdown/specification/archetype-metadata.md
+++ b/maven-archetype-plugin/src/site/markdown/specification/archetype-metadata.md
@@ -1,3 +1,10 @@
+---
+title: Archetype Metadata
+author: 
+  - Raphaël Piéroni
+date: 2011-09-30
+---
+
 <!--
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file
diff --git a/maven-archetype-plugin/src/site/markdown/specification/archetype.md b/maven-archetype-plugin/src/site/markdown/specification/archetype.md
index 0ac16bc0..0a8fda71 100644
--- a/maven-archetype-plugin/src/site/markdown/specification/archetype.md
+++ b/maven-archetype-plugin/src/site/markdown/specification/archetype.md
@@ -1,3 +1,10 @@
+---
+title: Archetype
+author: 
+  - Raphaël Piéroni
+date: 2011-09-30
+---
+
 <!--
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file
diff --git a/maven-archetype-plugin/src/site/markdown/specification/crawl-repository.md b/maven-archetype-plugin/src/site/markdown/specification/crawl-repository.md
index a853b9d0..1071a08e 100644
--- a/maven-archetype-plugin/src/site/markdown/specification/crawl-repository.md
+++ b/maven-archetype-plugin/src/site/markdown/specification/crawl-repository.md
@@ -1,3 +1,10 @@
+---
+title: Crawl Repository
+author: 
+  - Raphaël Piéroni
+date: 10 February 2008
+---
+
 <!--
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file
diff --git a/maven-archetype-plugin/src/site/markdown/specification/create-from-project.md b/maven-archetype-plugin/src/site/markdown/specification/create-from-project.md
index 412adc43..d01b51db 100644
--- a/maven-archetype-plugin/src/site/markdown/specification/create-from-project.md
+++ b/maven-archetype-plugin/src/site/markdown/specification/create-from-project.md
@@ -1,3 +1,10 @@
+---
+title: Create an Archetype from a Project
+author: 
+  - Raphaël Piéroni
+date: 2011-09-30
+---
+
 <!--
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file
diff --git a/maven-archetype-plugin/src/site/markdown/specification/generate.md b/maven-archetype-plugin/src/site/markdown/specification/generate.md
index 47b9895f..c3d26829 100644
--- a/maven-archetype-plugin/src/site/markdown/specification/generate.md
+++ b/maven-archetype-plugin/src/site/markdown/specification/generate.md
@@ -1,3 +1,10 @@
+---
+title: Create a Project from an Archetype
+author: 
+  - Raphaël Piéroni
+date: 2011-09-30
+---
+
 <!--
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file
diff --git a/maven-archetype-plugin/src/site/markdown/specification/specification.md b/maven-archetype-plugin/src/site/markdown/specification/specification.md
index 1a49f76e..15ce365c 100644
--- a/maven-archetype-plugin/src/site/markdown/specification/specification.md
+++ b/maven-archetype-plugin/src/site/markdown/specification/specification.md
@@ -1,3 +1,10 @@
+---
+title: Specification
+author: 
+  - Raphaël Piéroni
+date: 2011-09-30
+---
+
 <!--
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file
diff --git a/maven-archetype-plugin/src/site/markdown/specification/update-catalog.md b/maven-archetype-plugin/src/site/markdown/specification/update-catalog.md
index bc0d7cfe..de0fda51 100644
--- a/maven-archetype-plugin/src/site/markdown/specification/update-catalog.md
+++ b/maven-archetype-plugin/src/site/markdown/specification/update-catalog.md
@@ -1,3 +1,10 @@
+---
+title: Update local and remote Catalog
+author: 
+  - Raphaël Piéroni
+date: 10 February 2008
+---
+
 <!--
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file
diff --git a/maven-archetype-plugin/src/site/markdown/usage.md b/maven-archetype-plugin/src/site/markdown/usage.md
index f240ab73..aa2964dc 100644
--- a/maven-archetype-plugin/src/site/markdown/usage.md
+++ b/maven-archetype-plugin/src/site/markdown/usage.md
@@ -1,3 +1,12 @@
+---
+title: Usage
+author: 
+  - Raphaël Piéroni
+  - Olivier Lamy
+  - Hervé Boutemy
+date: 2011-09-30
+---
+
 <!--
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file
diff --git a/src/site/markdown/index.md b/src/site/markdown/index.md
index 510dcbd3..cc4a16fb 100644
--- a/src/site/markdown/index.md
+++ b/src/site/markdown/index.md
@@ -1,3 +1,10 @@
+---
+title: About
+author: 
+  - Jason van Zyl
+date: 2009-08-26
+---
+
 <!--
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file