diff --git a/byte-buddy-agent/pom.xml b/byte-buddy-agent/pom.xml
index cecdb429b7..2561447106 100644
--- a/byte-buddy-agent/pom.xml
+++ b/byte-buddy-agent/pom.xml
@@ -240,7 +240,7 @@
                         <version>${version.plugin.compiler}</version>
                         <executions>
                             <execution>
-                                <id>java8-multi-release</id>
+                                <id>multi-release</id>
                                 <goals>
                                     <goal>compile</goal>
                                 </goals>
diff --git a/byte-buddy-dep/pom.xml b/byte-buddy-dep/pom.xml
index b7ce06608d..03bbe0997a 100644
--- a/byte-buddy-dep/pom.xml
+++ b/byte-buddy-dep/pom.xml
@@ -370,7 +370,7 @@
                         <version>${version.plugin.compiler}</version>
                         <executions>
                             <execution>
-                                <id>java8-multi-release</id>
+                                <id>multi-release</id>
                                 <goals>
                                     <goal>compile</goal>
                                 </goals>
diff --git a/byte-buddy/pom.xml b/byte-buddy/pom.xml
index 3d9b4cc65a..4054f404b2 100644
--- a/byte-buddy/pom.xml
+++ b/byte-buddy/pom.xml
@@ -412,5 +412,49 @@
                 </plugins>
             </build>
         </profile>
+        <profile>
+            <id>multi-release</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>codes.rafael.bytecodeupdate</groupId>
+                        <artifactId>bytecode-update-maven-plugin</artifactId>
+                        <version>1.0-SNAPSHOT</version>
+                        <dependencies>
+                            <dependency>
+                                <groupId>org.ow2.asm</groupId>
+                                <artifactId>asm-commons</artifactId>
+                                <version>${version.asm}</version>
+                            </dependency>
+                        </dependencies>
+                        <executions>
+                            <execution>
+                                <id>multi-release</id>
+                                <goals>
+                                    <goal>update-bytecode</goal>
+                                </goals>
+                                <configuration>
+                                    <outputDirectory>${project.build.outputDirectory}/META-INF/versions/9</outputDirectory>
+                                    <oldPackage>${shade.source}</oldPackage>
+                                    <newPackage>${shade.target}</newPackage>
+                                    <artifacts>
+                                        <artifact>org\.ow2\.asm:.*</artifact>
+                                    </artifacts>
+                                    <includes>
+                                        <include>org/objectweb/asm/[a-zA-Z\.]+</include>
+                                        <include>org/objectweb/asm/signature/[a-zA-Z\.]+</include>
+                                        <include>org/objectweb/asm/commons/.*Remapper.*</include>
+                                        <include>org/objectweb/asm/commons/ModuleHashesAttribute.class</include>
+                                    </includes>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
 </project>
diff --git a/pom.xml b/pom.xml
index 3af295e54c..4a239d81f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -570,7 +570,6 @@
                 <jdk>9</jdk>
             </activation>
             <properties>
-                <project.build.outputTimestamp />
                 <sourcecode.main.version>1.6</sourcecode.main.version>
                 <sourcecode.test.version>1.6</sourcecode.test.version>
                 <bytecode.main.version>1.6</bytecode.main.version>