diff --git a/ChangeLog.md b/ChangeLog.md
index 7f4dc83..681d7c7 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -17,6 +17,31 @@
 under the License.
 -->
 
+**2020-01-09  Juan Pablo Santos (juanpablo AT apache DOT org)**
+
+* _2.11.0-M7-git-04_
+
+* [JSPWIKI-120](https://issues.apache.org/jira/browse/JSPWIKI-120): Separate rendering engine from core - following methods moved from 
+`WikiEngine` to `PageManager`
+    * `deletePage(..)` and `deleteVersion(..)` methods 
+    * `getPage(..)`
+    * `pageExist(..)` methods, renamed as `wikiPageExist(..)`
+    * `saveText()`
+    * `getText(..)` methods
+    * `getPureText( String, int )`
+    * `getRecentChanges()`
+    * `getVersionHistory()`
+    * `getCurrentProvider()` 
+    * `getCurrentProviderInfo()` and `getPageCount` were deleted - use instead existing `getProviderDescription()` and `getTotalPageCount` 
+    methods from `PageManager`
+* `WorkflowManager` renamed as `org.apache.wiki.workflow.DefaultWorkflowManager`, with new 
+ `org.apache.wiki.workflow.WorkflowManager` extracted as interface of the latter
+* Explicit casting from `WikiEngine#getAttribute()` and ` WikiPage#getAttribute()` no longer needed in most cases now
+* `TestEngine` now includes test class and method where it was created next to the timestamp, which is useful when you have tons of 
+timestamped dirs and want to know which folder was generated by what test
+  * Also, if no folder is given for work, pages and attachment dirs, it tries to place them under `./target/`
+* Applied format & fixes suggested by intellij to another bunch of files
+
 **2020-01-03  Juan Pablo Santos (juanpablo AT apache DOT org)**
 
 * _2.11.0-M7-git-03_
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/Release.java b/jspwiki-main/src/main/java/org/apache/wiki/Release.java
index 1a295a3..dde8024 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/Release.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/Release.java
@@ -72,7 +72,7 @@
      *  <p>
      *  If the build identifier is empty, it is not added.
      */
-    public static final String     BUILD         = "git-03";
+    public static final String     BUILD         = "git-04";
 
     /**
      *  This is the generic version string you should use when printing out the version.  It is of