diff --git a/lib/mk/libpahomqttcpp.mk b/lib/mk/libpahomqttcpp.mk
new file mode 100644
index 0000000..747e8a1
--- /dev/null
+++ b/lib/mk/libpahomqttcpp.mk
@@ -0,0 +1,25 @@
+LIBPAHOMQTTCPP_DIR := $(call select_from_ports,libpahomqttcpp)/src/lib/libpahomqttcpp
+
+vpath %.cpp $(LIBPAHOMQTTCPP_DIR)/src
+
+INC_DIR += $(LIBPAHOMQTTCPP_DIR)/src
+INC_DIR += $(LIBPAHOMQTTCPP_DIR)/pahomqttc/src
+
+SRC_CC = async_client.cpp \
+client.cpp \
+connect_options.cpp \
+disconnect_options.cpp \
+iclient_persistence.cpp \
+message.cpp \
+properties.cpp \
+response_options.cpp \
+ssl_options.cpp \
+string_collection.cpp \
+subscribe_options.cpp \
+token.cpp \
+topic.cpp \
+will_options.cpp
+
+LIBS += libc stdcxx
+
+CC_CXX_WARN_STRICT =
diff --git a/ports/libpahomqttcpp.hash b/ports/libpahomqttcpp.hash
new file mode 100644
index 0000000..73c0b50
--- /dev/null
+++ b/ports/libpahomqttcpp.hash
@@ -0,0 +1 @@
+05afc133ad189a20f561f811fcb78dbc370ccd08
diff --git a/ports/libpahomqttcpp.port b/ports/libpahomqttcpp.port
new file mode 100644
index 0000000..72c1d8a
--- /dev/null
+++ b/ports/libpahomqttcpp.port
@@ -0,0 +1,12 @@
+VERSION   := git
+DOWNLOADS := libpahomqttcpp.git libpahomqttc.git
+LICENSE   := EPL
+
+
+URL(libpahomqttcpp) := https://github.com/eclipse/paho.mqtt.cpp
+REV(libpahomqttcpp) := 0e44dd31ff725d66df4a928d50a26309626dcfd5
+DIR(libpahomqttcpp) := src/lib/libpahomqttcpp
+
+URL(libpahomqttc) := https://github.com/eclipse/paho.mqtt.c
+REV(libpahomqttc) := 153dfd3a4a1d510697c5d55e169fa158db16e04a
+DIR(libpahomqttc) := src/lib/libpahomqttcpp/pahomqttc
diff --git a/src/test/libpahomqttcpp/main.cc b/src/test/libpahomqttcpp/main.cc
new file mode 100644
index 0000000..0651fe5
--- /dev/null
+++ b/src/test/libpahomqttcpp/main.cc
@@ -0,0 +1,2 @@
+int main(int argc, char* argv[]) {
+}
diff --git a/src/test/libpahomqttcpp/target.mk b/src/test/libpahomqttcpp/target.mk
new file mode 100644
index 0000000..3759a18
--- /dev/null
+++ b/src/test/libpahomqttcpp/target.mk
@@ -0,0 +1,5 @@
+TARGET = test-libpahomqttcpp
+LIBS   = libpahomqttcpp
+SRC_CC = main.cc
+
+CC_CXX_WARN_STRICT =