diff --git a/org.eclipse.paho.client.eclipse.repository/pom.xml b/org.eclipse.paho.client.eclipse.repository/pom.xml
index bd51396..3da667a 100644
--- a/org.eclipse.paho.client.eclipse.repository/pom.xml
+++ b/org.eclipse.paho.client.eclipse.repository/pom.xml
@@ -15,6 +15,32 @@
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-maven-plugin</artifactId>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<version>2.8</version>
+				<executions>
+					<execution>
+						<id>unpack</id>
+						<phase>package</phase>
+						<goals>
+							<goal>unpack</goal>
+						</goals>
+						<configuration>
+							<artifactItems>
+								<artifactItem>
+									<groupId>org.eclipse.paho.tools</groupId>
+									<artifactId>org.eclipse.paho.client.eclipse.repository</artifactId>
+									<version>${paho.tools.version}</version>
+									<type>zip</type>
+									<overWrite>true</overWrite>
+									<outputDirectory>/shared/technology/paho/Java</outputDirectory>
+								</artifactItem>
+							</artifactItems>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 </project>
\ No newline at end of file
diff --git a/org.eclipse.paho.client.eclipse.view/pom.xml b/org.eclipse.paho.client.eclipse.view/pom.xml
index 94f7fda..a2aa9ed 100644
--- a/org.eclipse.paho.client.eclipse.view/pom.xml
+++ b/org.eclipse.paho.client.eclipse.view/pom.xml
@@ -56,23 +56,4 @@
 			</plugin>
 		</plugins>
 	</build>
-	<dependencies>
-		<dependency>
-			<groupId>org.eclipse.paho</groupId>
-			<artifactId>org.eclipse.paho.client.mqttv3</artifactId>
-			<version>${paho.tools.version}</version>
-		</dependency>
-	</dependencies>
-	<repositories>
-		<repository>
-			<id>paho-releases</id>
-			<name>Paho Repository - Releases</name>
-			<url>https://repo.eclipse.org/content/repositories/paho-releases/</url>
-		</repository>
-		<repository>
-			<id>paho-snapshots</id>
-			<name>Paho Repository - Snapshots</name>
-			<url>https://repo.eclipse.org/content/repositories/paho-snapshots/</url>
-		</repository>
-	</repositories>
 </project> 
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 3ea8377..56d6940 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,6 +56,11 @@
 			<url>${kepler.repo.url}</url>
 			<layout>p2</layout>
 		</repository>
+		<repository>
+			<id>eclipse-paho</id>
+			<url>http://build.eclipse.org/technology/paho/Java/client/</url>
+			<layout>p2</layout>
+		</repository>
 	</repositories>
 	
 	<build>