diff --git a/maven/infrastructure/artifact-deployer/objectteams-otdre-pom.xml b/maven/infrastructure/artifact-deployer/objectteams-otdre-pom.xml
new file mode 100644
index 0000000..ed039b4
--- /dev/null
+++ b/maven/infrastructure/artifact-deployer/objectteams-otdre-pom.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.eclipse.objectteams</groupId>
+  <artifactId>objectteams-otdre</artifactId>
+  <version>2.5.0</version>
+  <description>The Object Teams Dynamic Runtime Environment (OTDRE)</description>
+
+  <licenses>
+	<license>
+		<name>Eclipse Public License Version 1.0</name>
+		<comments>
+			This file is part of "Object Teams Development Tooling"-Software
+
+			Copyright 2016 GK Software AG and others.
+			All rights reserved. This program and the accompanying materials
+			are made available under the terms of the Eclipse Public License v1.0
+			which accompanies this distribution, and is available at
+			http://www.eclipse.org/legal/epl-v10.html
+
+			Please visit http://www.eclipse.org/objectteams for updates and contact.
+
+			Contributors:
+				Olaf Otto - Initial concept
+				Stephan Herrmann - Initial API and implementation
+		</comments>
+	</license>
+  </licenses>
+
+  <dependencies>
+	<dependency>
+		<groupId>org.ow2.asm</groupId>
+		<artifactId>asm-all</artifactId>
+		<version>5.0.1</version>
+		<scope>provided</scope>
+	</dependency>
+  </dependencies>
+</project>
diff --git a/maven/infrastructure/artifact-deployer/objectteams-otre-pom.xml b/maven/infrastructure/artifact-deployer/objectteams-otre-pom.xml
index d456a44..1df111a 100644
--- a/maven/infrastructure/artifact-deployer/objectteams-otre-pom.xml
+++ b/maven/infrastructure/artifact-deployer/objectteams-otre-pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.eclipse.objectteams</groupId>
   <artifactId>objectteams-otre</artifactId>
-  <version>2.3.0</version>
+  <version>2.5.0</version>
   <description>The Object Teams Runtime Environment (OTRE)</description>
 
   <licenses>
@@ -13,7 +13,7 @@
 		<comments>
 			This file is part of "Object Teams Development Tooling"-Software
 
-			Copyright 2010, 2013 GK Software AG and others.
+			Copyright 2010, 2016 GK Software AG and others.
 			All rights reserved. This program and the accompanying materials
 			are made available under the terms of the Eclipse Public License v1.0
 			which accompanies this distribution, and is available at
diff --git a/maven/infrastructure/artifact-deployer/pom.xml b/maven/infrastructure/artifact-deployer/pom.xml
index eeb3f8c..0540631 100644
--- a/maven/infrastructure/artifact-deployer/pom.xml
+++ b/maven/infrastructure/artifact-deployer/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.eclipse.objectteams</groupId>
 		<artifactId>objectteams-parent-pom</artifactId>
-		<version>2.3.0</version>
+		<version>2.5.0</version>
 		<relativePath>../parent-pom</relativePath>
 	</parent>
 
@@ -24,7 +24,7 @@
 			<comments>
 				This file is part of "Object Teams Development Tooling"-Software
 
-				Copyright 2010, 2014 GK Software AG and others.
+				Copyright 2010, 2016 GK Software AG and others.
 				All rights reserved. This program and the accompanying materials
 				are made available under the terms of the Eclipse Public License v1.0
 				which accompanies this distribution, and is available at
@@ -53,15 +53,19 @@
 	<properties>
 		<!-- Object Teams versions, update manually: 					-->
 		<!--   version of the signed ecotj jar file:	 				-->
-		<ecotj.version>R-2.3.0-201406101336-signed</ecotj.version> 
+		<ecotj.version>R-2.5.0-201606070953-signed</ecotj.version> 
 		<!--   version of the org.eclipse.objectteams.runtime plugin:	-->
-		<otre.version>2.3.0.201406101339</otre.version>
+		<otre.version>2.5.0.201606070956</otre.version>
+		<!--   version of the org.eclipse.objectteams.otredyn plugin:	-->
+		<otredyn.version>1.2.0.201606070956</otredyn.version>
 		
 		<!-- locate the jar files to install/deploy: -->
 	    <ecotj.jar.file>${ecj.export.dir}/ecotj-${ecotj.version}.jar</ecotj.jar.file>
 	    <otre.jar.file>${otre.export.dir}-${otre.version}/org.eclipse.objectteams.otre_${otre.version}.jar</otre.jar.file>
 	    <ot.runtime.jar.file>${otre.export.dir}-${otre.version}/org.eclipse.objectteams.runtime_${otre.version}.jar</ot.runtime.jar.file>
 	    <otre-agent.jar.file>${otre.export.dir}-${otre.version}/otre_agent.jar</otre-agent.jar.file>
+	    <otdre.jar.file>${otre.export.dir}-${otre.version}/org.eclipse.objectteams.otredyn_${otredyn.version}.jar</otdre.jar.file>
+	    <otdre-agent.jar.file>${otre.export.dir}-${otre.version}/otredyn_agent.jar</otdre-agent.jar.file>
 	    
     	<!-- Repository path of this module within the Object Teams git: -->
     	<project-repository-path>maven/infrastructure/artifacts-deployer</project-repository-path>
@@ -147,6 +151,44 @@
 						</configuration>
 					</execution>
 					<execution>
+						<id>deploy-otdre-as-maven-artifact</id>
+						<phase>deploy</phase>
+						<goals>
+							<goal>deploy-file</goal>
+						</goals>
+						<configuration>
+							<repositoryId>otEclipseRepo</repositoryId>
+							<packaging>jar</packaging>
+							<url>scpexe://${ot.host}:${ot.maven.repository.basepath}/repository</url>
+							<!-- The file to be deployed -->
+							<file>${otdre.jar.file}</file>
+							<groupId>${project.groupId}</groupId>
+							<artifactId>objectteams-otdre</artifactId>
+							<version>${otdre.version}</version>
+							<packaging>jar</packaging>
+							<pomFile>objectteams-otdre-pom.xml</pomFile>
+						</configuration>
+					</execution>
+					<execution>
+						<id>deploy-otdre-agent-as-maven-artifact</id>
+						<phase>deploy</phase>
+						<goals>
+							<goal>deploy-file</goal>
+						</goals>
+						<configuration>
+							<repositoryId>otEclipseRepo</repositoryId>
+							<packaging>jar</packaging>
+							<url>scpexe://${ot.host}:${ot.maven.repository.basepath}/repository</url>
+							<!-- The file to be deployed -->
+							<file>${otdre-agent.jar.file}</file>
+							<groupId>${project.groupId}</groupId>
+							<artifactId>objectteams-otdre-agent</artifactId>
+							<classifier>nodep</classifier>
+							<version>${otdre.version}</version>
+							<packaging>jar</packaging>
+						</configuration>
+					</execution>
+					<execution>
 						<id>deploy-ecotj-as-maven-artifact</id>
 						<phase>deploy</phase>
 						<goals>
@@ -223,6 +265,40 @@
 						</configuration>
 					</execution>
 					<execution>
+						<id>install-otdre-as-maven-artifact</id>
+						<phase>install</phase>
+						<goals>
+							<goal>install-file</goal>
+						</goals>
+						<configuration>
+							<packaging>jar</packaging>
+							<!-- The file to be deployed -->
+							<file>${otdre.jar.file}</file>
+							<groupId>${project.groupId}</groupId>
+							<artifactId>objectteams-otdre</artifactId>
+							<version>${otdre.version}</version>
+							<packaging>jar</packaging>
+							<pomFile>objectteams-otdre-pom.xml</pomFile>
+						</configuration>
+					</execution>
+					<execution>
+						<id>install-otdre-agent-as-maven-artifact</id>
+						<phase>install</phase>
+						<goals>
+							<goal>install-file</goal>
+						</goals>
+						<configuration>
+							<packaging>jar</packaging>
+							<!-- The file to be deployed -->
+							<file>${otdre-agent.jar.file}</file>
+							<groupId>${project.groupId}</groupId>
+							<artifactId>objectteams-otdre-agent</artifactId>
+							<classifier>nodep</classifier>
+							<version>${otdre.version}</version>
+							<packaging>jar</packaging>
+						</configuration>
+					</execution>
+					<execution>
 						<id>install-ecotj-as-maven-artifact</id>
 						<phase>install</phase>
 						<goals>