diff --git a/debian/control b/debian/control
index 920ccf2..721c97a 100644
--- a/debian/control
+++ b/debian/control
@@ -285,6 +285,22 @@ Description: nymea.io plugin for mailnotification
  This package will install the nymea.io plugin for mailnotification
 
 
+Package: nymea-plugin-mqttclient
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         nymea-plugins-translations,
+Replaces: guh-plugin-mqtt
+Description: nymea.io plugin for a generic MQTT client
+ The nymea daemon is a plugin based IoT (Internet of Things) server. The
+ server works like a translator for devices, things and services and
+ allows them to interact.
+ With the powerful rule engine you are able to connect any device available
+ in the system and create individual scenes and behaviors for your environment.
+ .
+ This package will install a generic MQTT client plugin for nymea.io
+
+
 Package: nymea-plugin-netatmo
 Architecture: any
 Depends: ${shlibs:Depends},
diff --git a/debian/nymea-plugin-mqttclient.install.in b/debian/nymea-plugin-mqttclient.install.in
new file mode 100644
index 0000000..8ea2fae
--- /dev/null
+++ b/debian/nymea-plugin-mqttclient.install.in
@@ -0,0 +1 @@
+usr/lib/@DEB_HOST_MULTIARCH@/nymea/plugins/libnymea_devicepluginmqttclient.so
diff --git a/nymea-plugins.pro b/nymea-plugins.pro
index fe31342..28248d3 100644
--- a/nymea-plugins.pro
+++ b/nymea-plugins.pro
@@ -21,7 +21,7 @@ PLUGIN_DIRS = \
     leynew              \
     lgsmarttv           \
     mailnotification    \
-    mqtt                \
+    mqttclient          \
     netatmo             \
     networkdetector     \
     openweathermap      \