Merge branch 'master' into master-juno
diff --git a/pom.xml b/pom.xml
index 7c6e29c..b2edb1e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,7 +84,6 @@
 	<profiles>
 		<profile>
 			<id>milestone</id>
-			<!-- This profile is only activated when building in Eclipse with m2e -->
 			<activation>
 				<property>
 					<name>milestone</name>
@@ -95,6 +94,14 @@
 			</properties>
 		</profile>
 		<profile>
+			<id>release</id>
+			<activation>
+				<property>
+					<name>release</name>
+				</property>
+			</activation>
+		</profile>
+		<profile>
 			<id>sign</id>
 			<activation>
 				<property>
diff --git a/releng/org.eclipse.gendoc.update-site/pom.xml b/releng/org.eclipse.gendoc.update-site/pom.xml
index 50976f0..29cca94 100644
--- a/releng/org.eclipse.gendoc.update-site/pom.xml
+++ b/releng/org.eclipse.gendoc.update-site/pom.xml
@@ -41,5 +41,33 @@
 				</plugins>
 			</build>
 		</profile>
+		<profile>
+			<id>release</id>
+			<!-- This profile is only activated when building in Eclipse with m2e -->
+			<activation>
+				<property>
+					<name>release</name>
+				</property>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.eclipse.tycho</groupId>
+						<artifactId>tycho-p2-repository-plugin</artifactId>
+						<version>${tycho.version}</version>
+						<configuration>
+							<finalName>${project.name}-${unqualifiedVersion}-${profile.id}</finalName>
+						</configuration>
+						<executions>
+							<execution>
+								<goals>
+									<goal>archive-repository</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
 	</profiles>
 </project> 
\ No newline at end of file
diff --git a/releng/toolkit/script/post_build_releases.sh b/releng/toolkit/script/post_build_releases.sh
new file mode 100755
index 0000000..371eb8e
--- /dev/null
+++ b/releng/toolkit/script/post_build_releases.sh
@@ -0,0 +1,21 @@
+#!/bin/bash -x
+profile=$1
+p2UpdateSite=$WORKSPACE/releng/org.eclipse.gendoc.update-site/target
+updateSite=$WORKSPACE
+downloadArea=/home/data/httpd/download.eclipse.org/gendoc
+releaseDownloadTarget=$downloadArea/updates/releases/0.7.0/$profile
+releaseDropsTarget=$downloadArea/releases/0.7.0/$profile
+
+rm -rf $updateSite/repository
+rm -rf $updateSite/*.zip
+mkdir -p $updateSite/repository
+mv $p2UpdateSite/repository $updateSite
+mv $p2UpdateSite/*.zip $updateSite
+
+rm -rf $releaseDownloadTarget
+mkdir -p $releaseDownloadTarget
+cp -rf $updateSite/repository/* $releaseDownloadTarget/
+
+rm -rf $milestonDropsTarget
+mkdir -p $releaseDropsTarget
+cp -rf $updateSite/*.zip $releaseDropsTarget/