diff --git a/pom.xml b/pom.xml
index 8156f60..520a19a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
   <parent>
      <groupId>org.apache.turbine</groupId>
      <artifactId>turbine-parent</artifactId>
-     <version>5</version>
+     <version>6-SNAPSHOT</version>
   </parent>
   <artifactId>turbine</artifactId>
   <name>Apache Turbine</name>
@@ -1094,37 +1094,37 @@
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-jcl</artifactId>
-      <version>${log4j2.version}</version>
+      <version>${turbine.log4j2.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-slf4j-impl</artifactId>
-      <version>${log4j2.version}</version>
+      <version>${turbine.log4j2.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-api</artifactId>
-      <version>${log4j2.version}</version>
+      <version>${turbine.log4j2.version}</version>
     </dependency>
     <dependency>
        <groupId>org.apache.logging.log4j</groupId>
        <artifactId>log4j-core</artifactId>
-       <version>${log4j2.version}</version>
+       <version>${turbine.log4j2.version}</version>
     </dependency>
     <!-- support of log4j-web (autodetect of log4j2 in WEB-INF folder) 
          may allow to remove explicit log4j2 loading/configuration except for tests -->
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-web</artifactId>
-      <version>${log4j2.version}</version>
+      <version>${turbine.log4j2.version}</version>
       <optional>true</optional>
     </dependency>
     <!-- optional log4j1.2 bridge instead of log4j -->
     <dependency>
         <groupId>org.apache.logging.log4j</groupId>
         <artifactId>log4j-1.2-api</artifactId>
-        <version>${log4j2.version}</version>
+        <version>${turbine.log4j2.version}</version>
         <optional>true</optional>
     </dependency>
     <dependency>
@@ -1219,11 +1219,10 @@
   <properties>
     <!-- maven.compiler setting in turbine parent -->
     <!-- TODO: Change for release: remove development part in path "/turbine/development" --> 
-    <turbine.site.path>turbine/development/turbine-5.0</turbine.site.path>
+    <turbine.site.path>turbine/turbine-5.0</turbine.site.path>
     <fulcrum.intake>2.0.0</fulcrum.intake>
     <fulcrum.security>1.1.3</fulcrum.security>
     <slf4j.version>1.7.26</slf4j.version>
-    <log4j2.version>2.11.2</log4j2.version>
     <dependency.check.skip>true</dependency.check.skip>
     <torque.version>4.0</torque.version>
     <jacoco.skip>true</jacoco.skip>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 21dad00..caa58e7 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -24,7 +24,9 @@
   </properties>
 
   <body>
-    <release version="5.0" date="in Subversion">
+     <release version="5.1" date="in Subversion">
+    </release>
+    <release version="5.0" date="2019-05-28">
       <action type="update" dev="tv">
         Change all Assembler modules to interfaces
       </action>
diff --git a/src/java/org/apache/turbine/services/jsonrpc/JsonRpcService.java b/src/java/org/apache/turbine/services/jsonrpc/JsonRpcService.java
index 082b02e..c58cdb7 100644
--- a/src/java/org/apache/turbine/services/jsonrpc/JsonRpcService.java
+++ b/src/java/org/apache/turbine/services/jsonrpc/JsonRpcService.java
@@ -55,7 +55,7 @@
      *
      * @param session the session
      * @param key the name of the object in the session
-     * @param value the object to register
+     * @param value the object to register (not null)
      */
     void registerObject(HttpSession session, String key, Object value);
 
@@ -63,7 +63,7 @@
      * Register an object with the {@link JSONRPCBridge} globally
      *
      * @param key the name of the object in the session
-     * @param value the object to register
+     * @param value the object to register (not null)
      */
     void registerObjectGlobal(String key, Object value);
 
diff --git a/xdocs/index.xml b/xdocs/index.xml
index 81b18d8..da0e1ae 100644
--- a/xdocs/index.xml
+++ b/xdocs/index.xml
@@ -42,15 +42,11 @@
     logic.</strong>
  </p>
 
- <p>
-    A couple example web applications that can benefit from using this
-    framework include <a
-    href="http://www.restorationhardware.com/">e-commerce shopping cart
-    systems</a>, Yahoo style link conservatories and <a
-    href="http://scarab.tigris.org/">project / bug / issue</a> tracking systems as
-    well as cool XML integration applications like <a
-    href="http://portals.apache.org/jetspeed-1/">Jetspeed</a>.
- </p>
+  <subsection name="Build a Web App">  
+   <p>With Turbine + Maven you could easily develop a lightweighted and robust web app in a structured way.
+   Find an example using Maven archetype mechanism <a href="https://github.com/apache/turbine-archetypes">here</a>.
+   </p>
+ </subsection>
 
  <p>
     <strong>A platform for building applications, not just running
@@ -81,9 +77,9 @@
 
  <p>
     This framework has an intended audience that is directed at web
-    engineers, not necessarily the web designers. By using this
+    engineers, not necessarily the web designers or front end engineers. By using this
     framework, it is possible for the web engineers to build intuitive
-    high level systems for the web designers to use, but the low level
+    high level systems for the web designers and front end engineers to use, but the low level
     framework is strictly for web engineers. Turbine is not a web
     application server. It is a tool for building web applications. Your
     <a href="http://tomcat.apache.org/">servlet engine</a> is your
@@ -94,7 +90,7 @@
  <p>
     <strong>Integration with Velocity is well
     defined and makes doing applications using these tools painless for
-    both the developers and the web designers!</strong>
+    both the developers and the web designers or front end engineers!</strong>
  </p>
 
  <p>
@@ -121,6 +117,13 @@
     Event</a> handling. Turbine is consided as Model 2 <strong>+ 1</strong>. :-) Please
     see the <a href="model2+1.html">discussion</a> of Model 2+1 for more information.
  </p>
+ 
+ <p>You may want to use JSON (de)serialization technics using Fulcrum JSON with Jackson 2, Gson or use Jackson mapper directly. 
+    Extending the models into any kind of views by following client view modelling, see e.g.
+    <a href="https://en.wikipedia.org/wiki/Model%E2%80%93view%E2%80%93viewmodel">MVVC</a> should be no problem.     
+    You could achieve this in many ways, e.g. using Turbine plain JSON screen, Turbine JSON-RPC or customizing in 
+    Velocity Javascript templates.
+ </p>
 
  <p>
     This all sounds like a bunch of marketing talk, but in reality,
@@ -133,17 +136,24 @@
 
  </section>
 
-<!--  section name="Where do I get releases?">
+<section name="Where do I get releases?">
 
+ <p>
+    Download the current main release sources and binaries through the Apache mirror system at 
+    <a href="http://www.apache.org/dyn/closer.cgi/turbine">the turbine download site</a>.
+  </p>
+  
   <p>
     Currently, the best way to get started with Turbine is to use the
-    <a href="/turbine/meta/">Maven Environment for Turbine Applications (M.E.T.A.)</a>.
-    You may also need <a href="http://db.apache.org/torque/">Torque</a> which
-    you can download from
-    <a href="http://db.apache.org/torque/download.html">here</a>.
+    Maven Archetypes, find it on <a href="https://github.com/apache/turbine-archetypes" 
+    title="Turbine Maven Archetype on GitHub">GitHub</a>. 
+    You might interested in the <a href="https://github.com/apache/turbine-archetypes/tree/docker">Docker branch (in development)</a> as well. 
+    See also the <a href="https://blogs.apache.org/turbine/entry/maven_archetypes_for_apache_turbine">blog post</a>
+    in the <a href="https://blogs.apache.org/turbine/">Turbine Blog</a> for
+    usage information. 
   </p>
 
-</section -->
+</section>
 
 <section name="How do I contribute, give feedback, fix bugs and so on?">
 
@@ -163,7 +173,7 @@
         We have a <a href="http://turbine.apache.org/contact.html">Turbine mailing
         lists</a> for discussion.</li>
     <li>
-        You can also access the <a href="cvs-usage.html">Turbine SVN
+        You can also access the <a href="http://svn.apache.org/viewvc/turbine/core/trunk/">Turbine SVN
         repository</a></li>
 </ul>