diff --git a/.gitmodules b/.gitmodules
index 1e3835f3c7a9cba78b88ca2c0ea91d1c5557166a..7fc80e81b45a124e7019994608543d1e37ad917d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "libs/mavlink/include/mavlink/v2.0"]
 	path = libs/mavlink/include/mavlink/v2.0
 	url = https://github.com/mavlink/c_library_v2.git
+[submodule "libs/thirdParty/tiny-AES128-C"]
+	path = libs/thirdParty/tiny-AES128-C
+	url = https://github.com/bkueng/tiny-AES128-C.git
diff --git a/libs/thirdParty/tiny-AES128-C b/libs/thirdParty/tiny-AES128-C
new file mode 160000
index 0000000000000000000000000000000000000000..28fcc570b97aba1f05336a5f7b06e63dc165d962
--- /dev/null
+++ b/libs/thirdParty/tiny-AES128-C
@@ -0,0 +1 @@
+Subproject commit 28fcc570b97aba1f05336a5f7b06e63dc165d962
diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro
index 1538424388db9b659220b1946d8c53c64b1904b0..7f68c78765c6d68010d9d5e63ad5c82956f53afd 100644
--- a/qgroundcontrol.pro
+++ b/qgroundcontrol.pro
@@ -585,6 +585,7 @@ HEADERS += \
     src/uas/UASInterface.h \
     src/uas/UASMessageHandler.h \
     src/AnalyzeView/LogDownloadController.h \
+    libs/thirdParty/tiny-AES128-C/aes.h \
 
 AndroidBuild {
 HEADERS += \
@@ -773,6 +774,7 @@ SOURCES += \
     src/uas/UAS.cc \
     src/uas/UASMessageHandler.cc \
     src/AnalyzeView/LogDownloadController.cc \
+    libs/thirdParty/tiny-AES128-C/aes.c \
 
 DebugBuild {
 SOURCES += \
@@ -850,6 +852,7 @@ INCLUDEPATH += \
     src/FirmwarePlugin \
     src/Vehicle \
     src/VehicleSetup \
+    libs/thirdParty/tiny-AES128-C \
 
 HEADERS+= \
     src/AutoPilotPlugins/AutoPilotPlugin.h \