diff --git a/README.md b/README.md
index 1893901..1508876 100644
--- a/README.md
+++ b/README.md
@@ -56,9 +56,9 @@
  * Incubator - https://github.com/apache/incubator
 
 ## JBake and other technotes
-* Currently using 2.5.1 via the `jbake-maven-plugin`, see under `/bin`, docs at http://jbake.org/docs/2.5.1
-* That version of JBake uses https://github.com/sirthias/pegdown for Markdown, syntax info at https://github.com/sirthias/pegdown/blob/master/src/test/resources/MarkdownTest103/Markdown%20Documentation%20-%20Syntax.md , extensions at http://www.decodified.com/pegdown/api/org/pegdown/Extensions.html
-* Using Groovy MarkupTemplateEngine, examples at https://github.com/jbake-org/jbake-example-project-groovy-mte , docs for that engine at http://groovy-lang.org/templating.html#_the_markuptemplateengine
+* Currently using 2.6.5 via the `jbake-maven-plugin`, see under `/bin`, docs at http://jbake.org/docs/2.6.5
+* That version of JBake uses [Flexmark](https://github.com/vsch/flexmark-java) as parser for Markdown and [Pegdown extensions](https://github.com/sirthias/pegdown)
+* The templates use the [Groovy Markup Template Engine](http://groovy-lang.org/templating.html#_the_markuptemplateengine), other examples are provided at https://github.com/jbake-org/jbake-example-project-groovy-mte
 
 
 ## Useful scripts and commands
diff --git a/pom.xml b/pom.xml
index eb28f88..10188d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
    KIND, either express or implied.  See the License for the
    specific language governing permissions and limitations
-   under the License.    
+   under the License.
 -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -33,6 +33,7 @@
     <repos.list.url>https://raw.githubusercontent.com/apache/sling-aggregator/master/default.xml</repos.list.url>
     <downloads.dir>${project.build.directory}/downloads</downloads.dir>
     <repos.list.fullpath>${downloads.dir}/github-repositories.xml</repos.list.fullpath>
+    <flexmark.version>0.61.0</flexmark.version>
   </properties>
 
   <build>
@@ -40,39 +41,41 @@
       <plugin>
         <groupId>org.jbake</groupId>
         <artifactId>jbake-maven-plugin</artifactId>
-        <version>0.2.0</version>
+        <version>0.3.2</version>
 
         <!-- dependencies -->
         <dependencies>
-
-          <!-- optional : a jbake version -->
+          <!-- upgrade JBake to the most recent version -->
           <dependency>
             <groupId>org.jbake</groupId>
             <artifactId>jbake-core</artifactId>
-            <version>2.5.1</version>
-          </dependency>
-          <!-- for freemarker templates (.ftl) -->
+            <version>2.6.5</version>
+         </dependency>
+         <!-- the following are only optional dependencies of jbake-core and
+               therefore need to be listed explicitly here to be loaded.
+               The versions should be the same as listed in jbake-core (listed in 
+               https://github.com/jbake-org/jbake/blob/master/gradle.properties and referenced in
+               https://github.com/jbake-org/jbake/blob/master/jbake-core/build.gradle).
+               Compare with https://github.com/jbake-org/jbake-maven-plugin/issues/14.
+          -->
+          <!-- for parsing MD -->
           <dependency>
-            <groupId>org.freemarker</groupId>
-            <artifactId>freemarker</artifactId>
-            <version>2.3.25-incubating</version>
+            <groupId>com.vladsch.flexmark</groupId>
+            <artifactId>flexmark</artifactId>
+            <version>${flexmark.version}</version>
           </dependency>
-          <!-- for markdown parsing (.md) -->
+          <!-- for supporting MD pegdown extensions -->
           <dependency>
-            <groupId>org.pegdown</groupId>
-            <artifactId>pegdown</artifactId>
-            <version>1.6.0</version>
+            <groupId>com.vladsch.flexmark</groupId>
+            <artifactId>flexmark-profile-pegdown</artifactId>
+            <version>${flexmark.version}</version>
           </dependency>
+          <!-- for supporting groovy templates with extension tpl -->
           <dependency>
-            <groupId>org.asciidoctor</groupId>
-            <artifactId>asciidoctorj</artifactId>
-            <version>1.5.5</version>
+            <groupId>org.codehaus.groovy</groupId>
+            <artifactId>groovy-templates</artifactId>
+            <version>3.0.2</version>
           </dependency>
-		  <dependency>
-		      <groupId>org.codehaus.groovy</groupId>
-		      <artifactId>groovy-all</artifactId>
-		      <version>2.4.12</version>
-		  </dependency>
         </dependencies>
 
         <executions>
@@ -85,7 +88,7 @@
           </execution>
         </executions>
       </plugin>
-	  
+
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>
diff --git a/src/main/jbake/jbake.properties b/src/main/jbake/jbake.properties
index 1e847ee..986b17f 100644
--- a/src/main/jbake/jbake.properties
+++ b/src/main/jbake/jbake.properties
@@ -10,7 +10,6 @@
 template.archive.file=archive.tpl
 template.tag.file=tags.tpl
 template.sitemap.file=sitemap.tpl
-template.post.file=post.tpl
 template.page.file=page.tpl
 template.feed.file=feed.tpl
 template.project.file=project.tpl
@@ -18,6 +17,7 @@
 render.index=false
 render.feed=false
 index.paginate=false
+img.path.update=false
 markdown.extensions=WIKILINKS,TABLES,ANCHORLINKS
 template.downloads.file=downloads.tpl
 sling.lastCommitBaseUrl=https://github.com/apache/sling-site/commit/
@@ -26,3 +26,4 @@
 template.encoding=UTF-8
 repolist.path=./target/downloads/github-repositories.xml
 sling.github.baseURL=https://github.com/apache/
+default.type=page
\ No newline at end of file
diff --git a/src/main/jbake/templates/downloads.tpl b/src/main/jbake/templates/downloads.tpl
index db3b3f5..ec1273d 100644
--- a/src/main/jbake/templates/downloads.tpl
+++ b/src/main/jbake/templates/downloads.tpl
@@ -283,7 +283,7 @@
   "Health Check Integration Tests|Migrated to Apache Felix Health Checks|org.apache.sling.hc.it|1.0.4",
   "Health Check Samples|Migrated to Apache Felix Health Checks|org.apache.sling.hc.samples|1.0.6",
   "Health Check Webconsole|Migrated to Apache Felix Health Checks|org.apache.sling.hc.webconsole|1.1.2",
-  "Installer Subystems Support|TODO moved here in commit b8c5ff0e2, please indicate why|org.apache.sling.installer.factory.subsystems|1.0.0",
+  "Installer Subystems Support|Not Maintained|org.apache.sling.installer.factory.subsystems|1.0.0",
   "JCR Compiler|Replaced with FS ClassLoader|org.apache.sling.jcr.compiler|2.1.0",
   "JCR Jackrabbit Server|Replaced with Apache Jackrabbit Oak|org.apache.sling.jcr.jackrabbit.server|2.3.0",
   "JCR Prefs|Replaced with CA Configs|org.apache.sling.jcr.prefs|1.0.0",