diff --git a/components/mqtt/CMakeLists.txt b/components/mqtt/CMakeLists.txt
new file mode 100644
index 0000000..ba5375c
--- /dev/null
+++ b/components/mqtt/CMakeLists.txt
@@ -0,0 +1,7 @@
+set(COMPONENT_ADD_INCLUDEDIRS esp-mqtt/include)
+set(COMPONENT_PRIV_INCLUDEDIRS "esp-mqtt/lib/include")
+set(COMPONENT_SRCDIRS esp-mqtt esp-mqtt/lib)
+
+set(COMPONENT_REQUIRES lwip nghttp mbedtls tcp_transport)
+
+register_component()
diff --git a/components/mqtt/Kconfig b/components/mqtt/Kconfig
new file mode 100644
index 0000000..273a2da
--- /dev/null
+++ b/components/mqtt/Kconfig
@@ -0,0 +1 @@
+source "$IDF_PATH/components/mqtt/esp-mqtt/Kconfig.included"
diff --git a/components/mqtt/component.mk b/components/mqtt/component.mk
new file mode 100644
index 0000000..19e4980
--- /dev/null
+++ b/components/mqtt/component.mk
@@ -0,0 +1,4 @@
+COMPONENT_SUBMODULES += esp-mqtt
+COMPONENT_ADD_INCLUDEDIRS := esp-mqtt/include
+COMPONENT_SRCDIRS :=  esp-mqtt esp-mqtt/lib
+COMPONENT_PRIV_INCLUDEDIRS := esp-mqtt/lib/include
diff --git a/components/mqtt/esp-mqtt b/components/mqtt/esp-mqtt
new file mode 160000
index 0000000..abaab2a
--- /dev/null
+++ b/components/mqtt/esp-mqtt
@@ -0,0 +1 @@
+Subproject commit abaab2abccc019aa57f5b9afaf57f0d49f7b1b6f