diff --git a/components/device-mgt-iot-androidsense/org.wso2.carbon.device.mgt.iot.androidsense.controller.api/pom.xml b/components/device-mgt-iot-androidsense/org.wso2.carbon.device.mgt.iot.androidsense.controller.api/pom.xml
index 06fb0adf44..5dbca02159 100644
--- a/components/device-mgt-iot-androidsense/org.wso2.carbon.device.mgt.iot.androidsense.controller.api/pom.xml
+++ b/components/device-mgt-iot-androidsense/org.wso2.carbon.device.mgt.iot.androidsense.controller.api/pom.xml
@@ -56,7 +56,7 @@
         <!--MQTT -->
         <dependency>
             <groupId>org.eclipse.paho</groupId>
-            <artifactId>mqtt-client</artifactId>
+            <artifactId>org.eclipse.paho.client.mqttv3</artifactId>
         </dependency>
 
         <!--IOT -->
diff --git a/components/device-mgt-iot-androidsense/org.wso2.carbon.device.mgt.iot.androidsense.manager.api/pom.xml b/components/device-mgt-iot-androidsense/org.wso2.carbon.device.mgt.iot.androidsense.manager.api/pom.xml
index 68d386f068..c0b288bf70 100644
--- a/components/device-mgt-iot-androidsense/org.wso2.carbon.device.mgt.iot.androidsense.manager.api/pom.xml
+++ b/components/device-mgt-iot-androidsense/org.wso2.carbon.device.mgt.iot.androidsense.manager.api/pom.xml
@@ -56,7 +56,7 @@
         <!--MQTT -->
         <dependency>
             <groupId>org.eclipse.paho</groupId>
-            <artifactId>mqtt-client</artifactId>
+            <artifactId>org.eclipse.paho.client.mqttv3</artifactId>
         </dependency>
 
         <!--IOT -->
diff --git a/components/device-mgt-iot-arduino/org.wso2.carbon.device.mgt.iot.arduino.controller.service.impl/pom.xml b/components/device-mgt-iot-arduino/org.wso2.carbon.device.mgt.iot.arduino.controller.service.impl/pom.xml
index cea548cb70..280a087d7d 100644
--- a/components/device-mgt-iot-arduino/org.wso2.carbon.device.mgt.iot.arduino.controller.service.impl/pom.xml
+++ b/components/device-mgt-iot-arduino/org.wso2.carbon.device.mgt.iot.arduino.controller.service.impl/pom.xml
@@ -95,7 +95,7 @@
 		<!--MQTT -->
 		<dependency>
 			<groupId>org.eclipse.paho</groupId>
-			<artifactId>mqtt-client</artifactId>
+			<artifactId>org.eclipse.paho.client.mqttv3</artifactId>
 			<scope>provided</scope>
 		</dependency>
 
diff --git a/components/device-mgt-iot-arduino/org.wso2.carbon.device.mgt.iot.arduino.manager.service.impl/pom.xml b/components/device-mgt-iot-arduino/org.wso2.carbon.device.mgt.iot.arduino.manager.service.impl/pom.xml
index 947854d9b5..ef3c4bb043 100644
--- a/components/device-mgt-iot-arduino/org.wso2.carbon.device.mgt.iot.arduino.manager.service.impl/pom.xml
+++ b/components/device-mgt-iot-arduino/org.wso2.carbon.device.mgt.iot.arduino.manager.service.impl/pom.xml
@@ -95,7 +95,7 @@
 		<!--MQTT -->
 		<dependency>
 			<groupId>org.eclipse.paho</groupId>
-			<artifactId>mqtt-client</artifactId>
+			<artifactId>org.eclipse.paho.client.mqttv3</artifactId>
 			<scope>provided</scope>
 		</dependency>
 
diff --git a/components/device-mgt-iot-digitaldisplay/org.wso2.carbon.device.mgt.iot.digitaldisplay.controller.api/pom.xml b/components/device-mgt-iot-digitaldisplay/org.wso2.carbon.device.mgt.iot.digitaldisplay.controller.api/pom.xml
index 93654440b2..8f9e1b7d16 100644
--- a/components/device-mgt-iot-digitaldisplay/org.wso2.carbon.device.mgt.iot.digitaldisplay.controller.api/pom.xml
+++ b/components/device-mgt-iot-digitaldisplay/org.wso2.carbon.device.mgt.iot.digitaldisplay.controller.api/pom.xml
@@ -81,7 +81,7 @@
         <!--MQTT -->
         <dependency>
             <groupId>org.eclipse.paho</groupId>
-            <artifactId>mqtt-client</artifactId>
+            <artifactId>org.eclipse.paho.client.mqttv3</artifactId>
             <scope>provided</scope>
         </dependency>
 
diff --git a/components/device-mgt-iot-digitaldisplay/org.wso2.carbon.device.mgt.iot.digitaldisplay.manager.api/pom.xml b/components/device-mgt-iot-digitaldisplay/org.wso2.carbon.device.mgt.iot.digitaldisplay.manager.api/pom.xml
index 7ee7ee699b..61d3e03158 100644
--- a/components/device-mgt-iot-digitaldisplay/org.wso2.carbon.device.mgt.iot.digitaldisplay.manager.api/pom.xml
+++ b/components/device-mgt-iot-digitaldisplay/org.wso2.carbon.device.mgt.iot.digitaldisplay.manager.api/pom.xml
@@ -81,7 +81,7 @@
         <!--MQTT -->
         <dependency>
             <groupId>org.eclipse.paho</groupId>
-            <artifactId>mqtt-client</artifactId>
+            <artifactId>org.eclipse.paho.client.mqttv3</artifactId>
             <scope>provided</scope>
         </dependency>
 
diff --git a/components/device-mgt-iot-droneanalyzer/org.wso2.carbon.device.mgt.iot.droneanalyzer.controller.api/pom.xml b/components/device-mgt-iot-droneanalyzer/org.wso2.carbon.device.mgt.iot.droneanalyzer.controller.api/pom.xml
index 6b691ea312..761e767251 100644
--- a/components/device-mgt-iot-droneanalyzer/org.wso2.carbon.device.mgt.iot.droneanalyzer.controller.api/pom.xml
+++ b/components/device-mgt-iot-droneanalyzer/org.wso2.carbon.device.mgt.iot.droneanalyzer.controller.api/pom.xml
@@ -77,7 +77,7 @@
         <!--MQTT -->
         <dependency>
             <groupId>org.eclipse.paho</groupId>
-            <artifactId>mqtt-client</artifactId>
+            <artifactId>org.eclipse.paho.client.mqttv3</artifactId>
             <scope>provided</scope>
         </dependency>
 
diff --git a/components/device-mgt-iot-droneanalyzer/org.wso2.carbon.device.mgt.iot.droneanalyzer.manager.api/pom.xml b/components/device-mgt-iot-droneanalyzer/org.wso2.carbon.device.mgt.iot.droneanalyzer.manager.api/pom.xml
index 4afb1bfe84..be87495fdb 100644
--- a/components/device-mgt-iot-droneanalyzer/org.wso2.carbon.device.mgt.iot.droneanalyzer.manager.api/pom.xml
+++ b/components/device-mgt-iot-droneanalyzer/org.wso2.carbon.device.mgt.iot.droneanalyzer.manager.api/pom.xml
@@ -77,7 +77,7 @@
         <!--MQTT -->
         <dependency>
             <groupId>org.eclipse.paho</groupId>
-            <artifactId>mqtt-client</artifactId>
+            <artifactId>org.eclipse.paho.client.mqttv3</artifactId>
             <scope>provided</scope>
         </dependency>
 
diff --git a/components/device-mgt-iot-raspberrypi/org.wso2.carbon.device.mgt.iot.raspberrypi.controller.service.impl/pom.xml b/components/device-mgt-iot-raspberrypi/org.wso2.carbon.device.mgt.iot.raspberrypi.controller.service.impl/pom.xml
index 2de29d034a..a599aa9d59 100644
--- a/components/device-mgt-iot-raspberrypi/org.wso2.carbon.device.mgt.iot.raspberrypi.controller.service.impl/pom.xml
+++ b/components/device-mgt-iot-raspberrypi/org.wso2.carbon.device.mgt.iot.raspberrypi.controller.service.impl/pom.xml
@@ -75,7 +75,7 @@
 		<!--MQTT -->
 		<dependency>
 			<groupId>org.eclipse.paho</groupId>
-			<artifactId>mqtt-client</artifactId>
+			<artifactId>org.eclipse.paho.client.mqttv3</artifactId>
 			<scope>provided</scope>
 		</dependency>
 
diff --git a/components/device-mgt-iot-raspberrypi/org.wso2.carbon.device.mgt.iot.raspberrypi.manager.service.impl/pom.xml b/components/device-mgt-iot-raspberrypi/org.wso2.carbon.device.mgt.iot.raspberrypi.manager.service.impl/pom.xml
index 3ae27fe1a2..0d55f46f83 100644
--- a/components/device-mgt-iot-raspberrypi/org.wso2.carbon.device.mgt.iot.raspberrypi.manager.service.impl/pom.xml
+++ b/components/device-mgt-iot-raspberrypi/org.wso2.carbon.device.mgt.iot.raspberrypi.manager.service.impl/pom.xml
@@ -75,7 +75,7 @@
 		<!--MQTT -->
 		<dependency>
 			<groupId>org.eclipse.paho</groupId>
-			<artifactId>mqtt-client</artifactId>
+			<artifactId>org.eclipse.paho.client.mqttv3</artifactId>
 			<scope>provided</scope>
 		</dependency>
 
diff --git a/components/device-mgt-iot-virtualfirealarm/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.advanced.impl/pom.xml b/components/device-mgt-iot-virtualfirealarm/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.advanced.impl/pom.xml
index ec4d562bcb..2dfa86db36 100644
--- a/components/device-mgt-iot-virtualfirealarm/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.advanced.impl/pom.xml
+++ b/components/device-mgt-iot-virtualfirealarm/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.advanced.impl/pom.xml
@@ -92,7 +92,7 @@
 		<!--Dependency on MQTT Client Library-->
 		<dependency>
 			<groupId>org.eclipse.paho</groupId>
-			<artifactId>mqtt-client</artifactId>
+			<artifactId>org.eclipse.paho.client.mqttv3</artifactId>
 			<version>${paho.mqtt.version}</version>
 		</dependency>
 
@@ -225,7 +225,7 @@
 		<jetty.version>8.1.3.v20120416</jetty.version>
 
 		<!-- MQTT Paho Version -->
-		<paho.mqtt.version>0.4.0</paho.mqtt.version>
+		<paho.mqtt.version>1.0.2</paho.mqtt.version>
 
 		<!-- Jivesoftware XMPP Version -->
 		<smack.wso2.version>3.0.4.wso2v1</smack.wso2.version>
diff --git a/components/device-mgt-iot-virtualfirealarm/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.impl/pom.xml b/components/device-mgt-iot-virtualfirealarm/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.impl/pom.xml
index 7194d3aabb..94b18068cd 100644
--- a/components/device-mgt-iot-virtualfirealarm/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.impl/pom.xml
+++ b/components/device-mgt-iot-virtualfirealarm/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.impl/pom.xml
@@ -101,7 +101,7 @@
 		<!--Dependency on MQTT Client Library-->
 		<dependency>
 			<groupId>org.eclipse.paho</groupId>
-			<artifactId>mqtt-client</artifactId>
+			<artifactId>org.eclipse.paho.client.mqttv3</artifactId>
 			<version>${paho.mqtt.version}</version>
 		</dependency>
 
@@ -209,7 +209,7 @@
 		<jetty.version>8.1.3.v20120416</jetty.version>
 
 		<!-- MQTT Paho Version -->
-		<paho.mqtt.version>0.4.0</paho.mqtt.version>
+		<paho.mqtt.version>1.0.2</paho.mqtt.version>
 
 		<!-- Jivesoftware XMPP Version -->
 		<smack.wso2.version>3.0.4.wso2v1</smack.wso2.version>
diff --git a/components/device-mgt-iot-virtualfirealarm/org.wso2.carbon.device.mgt.iot.virtualfirealarm.controller.service.impl/pom.xml b/components/device-mgt-iot-virtualfirealarm/org.wso2.carbon.device.mgt.iot.virtualfirealarm.controller.service.impl/pom.xml
index 0121d62aa6..9155395646 100644
--- a/components/device-mgt-iot-virtualfirealarm/org.wso2.carbon.device.mgt.iot.virtualfirealarm.controller.service.impl/pom.xml
+++ b/components/device-mgt-iot-virtualfirealarm/org.wso2.carbon.device.mgt.iot.virtualfirealarm.controller.service.impl/pom.xml
@@ -99,7 +99,7 @@
 		<!--MQTT -->
 		<dependency>
 			<groupId>org.eclipse.paho</groupId>
-			<artifactId>mqtt-client</artifactId>
+			<artifactId>org.eclipse.paho.client.mqttv3</artifactId>
 			<scope>provided</scope>
 		</dependency>
 
diff --git a/components/device-mgt-iot-virtualfirealarm/org.wso2.carbon.device.mgt.iot.virtualfirealarm.manager.service.impl/pom.xml b/components/device-mgt-iot-virtualfirealarm/org.wso2.carbon.device.mgt.iot.virtualfirealarm.manager.service.impl/pom.xml
index ac6dce5cf8..5e15ac98a8 100644
--- a/components/device-mgt-iot-virtualfirealarm/org.wso2.carbon.device.mgt.iot.virtualfirealarm.manager.service.impl/pom.xml
+++ b/components/device-mgt-iot-virtualfirealarm/org.wso2.carbon.device.mgt.iot.virtualfirealarm.manager.service.impl/pom.xml
@@ -99,7 +99,7 @@
 		<!--MQTT -->
 		<dependency>
 			<groupId>org.eclipse.paho</groupId>
-			<artifactId>mqtt-client</artifactId>
+			<artifactId>org.eclipse.paho.client.mqttv3</artifactId>
 			<scope>provided</scope>
 		</dependency>
 
diff --git a/components/device-mgt-iot/org.wso2.carbon.device.mgt.iot/pom.xml b/components/device-mgt-iot/org.wso2.carbon.device.mgt.iot/pom.xml
index 0e38024656..117ba82dcd 100644
--- a/components/device-mgt-iot/org.wso2.carbon.device.mgt.iot/pom.xml
+++ b/components/device-mgt-iot/org.wso2.carbon.device.mgt.iot/pom.xml
@@ -95,11 +95,11 @@
                             org.wso2.carbon.device.mgt.core.*,
                             org.wso2.carbon.context.*;version="${carbon.kernel.version.range}",
                             org.wso2.carbon.ndatasource.core;version="${carbon.kernel.version.range}",
+                            org.eclipse.paho.client.mqttv3.*;version="${eclipse.paho.version}"
                         </Import-Package>
                         <Export-Package>
                             !org.wso2.carbon.device.mgt.iot.internal,
-                            org.wso2.carbon.device.mgt.iot.*;version="${project.version}",
-                            org.eclipse.paho.client.mqttv3.*;version="${eclipse.paho.version}"
+                            org.wso2.carbon.device.mgt.iot.*;version="${project.version}"
                         </Export-Package>
 
                     </instructions>
@@ -181,7 +181,7 @@
         <!--</dependency>-->
 
         <!--<dependency>-->
-        <!--<groupId>com.h2database.wso2</groupId>-->
+        <!--<groupId> h2database.wso2</groupId>-->
         <!--<artifactId>h2-database-engine</artifactId>-->
         <!--<scope>test</scope>-->
         <!--</dependency>-->
@@ -214,9 +214,10 @@
 
         <dependency>
             <groupId>org.eclipse.paho</groupId>
-            <artifactId>mqtt-client</artifactId>
+            <artifactId>org.eclipse.paho.client.mqttv3</artifactId>
         </dependency>
 
+
         <dependency>
             <groupId>org.wso2.carbon.devicemgt</groupId>
             <artifactId>org.wso2.carbon.device.mgt.analytics</artifactId>
@@ -231,14 +232,6 @@
             <groupId>org.igniterealtime.smack.wso2</groupId>
             <artifactId>smackx</artifactId>
         </dependency>
-
     </dependencies>
 
-    <repositories>
-        <repository>
-            <id>Eclipse Paho Repo</id>
-            <url>http://repo.spring.io/plugins-release/</url>
-        </repository>
-    </repositories>
-
 </project>
diff --git a/features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/pom.xml b/features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/pom.xml
index e3a1b3a40a..de89ed4390 100644
--- a/features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/pom.xml
+++ b/features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/pom.xml
@@ -146,6 +146,9 @@
 								<bundleDef>
 									org.json.wso2:json:${commons-json.version}
 								</bundleDef>
+								<bundleDef>
+									org.eclipse.paho:org.eclipse.paho.client.mqttv3:${eclipse.paho.version}
+								</bundleDef>
 								<bundleDef>
 									org.igniterealtime.smack.wso2:smack:${smack.wso2.version}
 								</bundleDef>
diff --git a/pom.xml b/pom.xml
index a3f9ec752e..73f173968a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -525,7 +525,7 @@
             </dependency>
             <dependency>
                 <groupId>org.eclipse.paho</groupId>
-                <artifactId>mqtt-client</artifactId>
+                <artifactId>org.eclipse.paho.client.mqttv3</artifactId>
                 <version>${eclipse.paho.version}</version>
             </dependency>
             <dependency>
@@ -1278,7 +1278,7 @@
         <!--XMPP/MQTT Version-->
         <smack.wso2.version>3.0.4.wso2v1</smack.wso2.version>
         <smackx.wso2.version>3.0.4.wso2v1</smackx.wso2.version>
-        <eclipse.paho.version>0.4.0</eclipse.paho.version>
+        <eclipse.paho.version>1.0.2</eclipse.paho.version>
 
         <!-- Jetty Server Version -->
         <jetty.version>8.1.3.v20120416</jetty.version>