diff --git a/build.xml b/build.xml
index 51ac8c3..1038dac 100644
--- a/build.xml
+++ b/build.xml
@@ -367,13 +367,6 @@
       verify="yes" stubversion="1.2"
     />
     
-    <!-- We don't have this file in 2.4.X... yet?
-    <copy
-      file="build/classes/freemarker/core/SecureRendererImpl.class"
-      tofile="build/classes/freemarker/core/SecureRendererImpl.clazz"
-    />
-    -->
-    
     <copy toDir="build/classes">
       <fileset dir="src/main/resources"
         excludes="
@@ -387,12 +380,11 @@
       />
     </copy>
     <copy toDir="build/classes/META-INF">
-      <fileset dir="." includes="LICENSE, DISCLAIMER" />
+      <fileset dir="." includes="DISCLAIMER" />
     </copy>
     <copy toDir="build/classes/META-INF">
       <fileset dir="src/dist/jar/META-INF" includes="*" />
     </copy>
-    
     <delete dir="build/src-main-java-filtered" />
   </target>
 
diff --git a/osgi.bnd b/osgi.bnd
index 9cc8cd8..08bac25 100644
--- a/osgi.bnd
+++ b/osgi.bnd
@@ -49,10 +49,10 @@
 # This is needed for "a.class.from.another.Bundle"?new() to work.
 DynamicImport-Package: *
 
-# The required minimum is 1.4, but we utilize 1.5 if available.
+# The required minimum is 1.5, but we utilize versions up to 1.8 if available.
 # See also: http://wiki.eclipse.org/Execution_Environments, "Compiling
 # against more than is required"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5, J2SE-1.4
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8, JavaSE-1.7, JavaSE-1.6, J2SE-1.5
 
 # Non-OSGi meta:
 Main-Class: freemarker.core.CommandLine
diff --git a/src/main/resources/freemarker/version.properties b/src/main/resources/freemarker/version.properties
index f772df2..8878cbd 100644
--- a/src/main/resources/freemarker/version.properties
+++ b/src/main/resources/freemarker/version.properties
@@ -58,12 +58,12 @@
 # - When the major version number is increased, major backward
 #   compatibility violations are allowed, but still should be avoided.
 # During Apache Incubation, "-incubating" is added to this string.
-version=2.3.26-nightly-incubating
+version=2.3.26-incubating
 # This exists as oss.sonatype only allows SNAPSHOT and final releases,
 # so instead 2.3.21-rc01 and such we have to use 2.3.21-SNAPSHOT there.
 # For final releases it's the same as "version".
 # During Apache Incubation, "-incubating" is added to this string.
-mavenVersion=2.3.26-SNAPSHOT-incubating
+mavenVersion=2.3.26-incubating
 
 # Version string that conforms to OSGi
 # ------------------------------------
@@ -77,7 +77,7 @@
 #   2.4.0.pre01
 #   2.4.0.nightly_@timestampInVersion@
 # During Apache Incubation, "-incubating" is added to this string.
-versionForOSGi=2.3.26.nightly_@timestampInVersion@-incubating
+versionForOSGi=2.3.26.stable-incubating
 
 # Version string that conforms to legacy MF
 # -----------------------------------------
@@ -95,7 +95,7 @@
 # "97 denotes "nightly", 98 denotes "pre", 99 denotes "rc" build.
 # In general, for the nightly/preview/rc Y of version 2.X, the versionForMf is
 # 2.X-1.(99|98).Y. Note the X-1.
-versionForMf=2.3.25.97
+versionForMf=2.3.26
 
 # The date of the build.
 # This should be automatically filled by the building tool (Ant).
diff --git a/src/manual/en_US/book.xml b/src/manual/en_US/book.xml
index 69cd696..a664a84 100644
--- a/src/manual/en_US/book.xml
+++ b/src/manual/en_US/book.xml
@@ -26813,7 +26813,7 @@
       <section xml:id="versions_2_3_26">
         <title>2.3.26 (incubating at Apache)</title>
 
-        <para>Release date: 2017-FIXME</para>
+        <para>Release date: 2017-03-15 + release process delay</para>
 
         <para><emphasis role="bold">This is a stable, final
         release.</emphasis> The <quote>incubating</quote> suffix is required
@@ -26825,19 +26825,6 @@
 
           <itemizedlist>
             <listitem>
-              <para>Bug fixed (<link
-              xlink:href="https://issues.apache.org/jira/browse/FREEMARKER-42">FREEMARKER-42</link>):
-              <literal>?first</literal> now works with FTL collections (things
-              that can be listed but doesn't support getting items by index),
-              not only with sequences. The practical importance of this is
-              that <literal>?first</literal> now always works on Java
-              <literal>Set</literal>-s (which is useful for
-              <literal>Set</literal>-s with well defined ordering), while
-              earlier it has failed depending on the
-              <literal>object_wrapper</literal> configuration setting.</para>
-            </listitem>
-
-            <listitem>
               <para>Added
               <literal><replaceable>node</replaceable>?next_sibling</literal>
               and
@@ -26858,6 +26845,19 @@
               keys <link
               linkend="xgui_imperative_formal">here...</link>)</para>
             </listitem>
+
+            <listitem>
+              <para>Bug fixed (<link
+              xlink:href="https://issues.apache.org/jira/browse/FREEMARKER-42">FREEMARKER-42</link>):
+              <literal>?first</literal> now works with FTL collections (things
+              that can be listed but doesn't support getting items by index),
+              not only with sequences. The practical importance of this is
+              that <literal>?first</literal> now always works on Java
+              <literal>Set</literal>-s (which is useful for
+              <literal>Set</literal>-s with well defined ordering), while
+              earlier it has failed depending on the
+              <literal>object_wrapper</literal> configuration setting.</para>
+            </listitem>
           </itemizedlist>
         </section>
 
@@ -26941,6 +26941,16 @@
             </listitem>
 
             <listitem>
+              <para>Bug fixed: The OSGi
+              <literal>Bundle-RequiredExecutionEnvironment</literal> entry in
+              <literal>META-INF/MANIFEST.MF</literal> has incorrectly stated
+              that the minimum required version is
+              <literal>J2SE-1.4</literal>, while it's in fact
+              <literal>J2SE-1.5</literal>. Also the highest utilized version
+              was raised to <literal>JavaSE-1.8</literal>.</para>
+            </listitem>
+
+            <listitem>
               <para>Bug fixed: If <link
               linkend="pgui_config_incompatible_improvements_how_to_set">the
               <literal>incompatible_improvements</literal> setting</link> is
@@ -27049,10 +27059,11 @@
 
             <listitem>
               <para><literal>BeansWrapperConfiguration.classIntrospectorFactory</literal>
-              is no more protected field, but private. Especially as the class
-              of this field (<literal>ClassIntrospectorBuilder</literal>) was
-              package private, it's pretty much sure that nobody depends on
-              this field.</para>
+              is not a protected field anymore, but a private one. Especially
+              as the class of that field
+              (<literal>ClassIntrospectorBuilder</literal>) was package
+              private, it's pretty much sure that nobody depends on this
+              field.</para>
             </listitem>
 
             <listitem>