diff --git a/.gitmodules b/.gitmodules
index 11238bc6c..f8fd9d731 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -56,3 +56,6 @@
 [submodule "Libraries/xz"]
 	path = Libraries/xz
 	url = https://github.com/tukaani-project/xz.git
+[submodule "Libraries/comport"]
+	path = Libraries/comport
+	url = https://git.iem.at/pd/comport.git
diff --git a/Libraries/CMakeLists.txt b/Libraries/CMakeLists.txt
index 64f5b5ad8..e110f8fff 100755
--- a/Libraries/CMakeLists.txt
+++ b/Libraries/CMakeLists.txt
@@ -443,11 +443,15 @@ add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/pd-else/Source/Shared/opus)
 target_compile_definitions(opus PRIVATE FLOAT_APPROX=1)
 unset(MESSAGE_QUIET)
 
+set(COMPORT_SOURCES
+    ${CMAKE_CURRENT_SOURCE_DIR}/comport/comport.c
+)
+
 # ------------------------------------------------------------------------------#
 # TARGETS
 # ------------------------------------------------------------------------------#
-add_library(externals STATIC ${ELSE_SOURCES} ${CYCLONE_SOURCES} ${PDLUA_SOURCES})
-add_library(externals-multi STATIC ${ELSE_SOURCES} ${CYCLONE_SOURCES} ${PDLUA_SOURCES} ${})
+add_library(externals STATIC ${ELSE_SOURCES} ${CYCLONE_SOURCES} ${PDLUA_SOURCES} ${COMPORT_SOURCES})
+add_library(externals-multi STATIC ${ELSE_SOURCES} ${CYCLONE_SOURCES} ${PDLUA_SOURCES} ${COMPORT_SOURCES})
 
 # Hide deprecation warnings on externals, it's noise and are outside of our control
 if(MSVC)
@@ -509,6 +513,7 @@ target_include_directories(externals PRIVATE ${LUA_INCLUDE_DIR} ${SFONT_INCLUDES
 target_include_directories(externals-multi PRIVATE ${LUA_INCLUDE_DIR} ${SFONT_INCLUDES})
 
 
+
 # ------------------------------------------------------------------------------#
 # LINK
 # ------------------------------------------------------------------------------#
diff --git a/Libraries/comport b/Libraries/comport
new file mode 160000
index 000000000..da2e52bad
--- /dev/null
+++ b/Libraries/comport
@@ -0,0 +1 @@
+Subproject commit da2e52badc99c9b1b3f7230476b8aa14f2ec2ba1
diff --git a/Source/Pd/Setup.cpp b/Source/Pd/Setup.cpp
index fa8bd5e7a..c251acf62 100644
--- a/Source/Pd/Setup.cpp
+++ b/Source/Pd/Setup.cpp
@@ -160,6 +160,7 @@ extern "C" {
 
 void pd_init();
 
+
 #if ENABLE_GEM
 void Gem_setup(t_symbol* plugin_path);
 void gemcubeframebuffer_setup();
@@ -1026,6 +1027,7 @@ void crossover_tilde_setup();
 void setup_ctl0x2ein();
 void setup_ctl0x2eout();
 void cusp_tilde_setup();
+void comport_setup(void);
 void datetime_setup();
 void dir_setup();
 void db2lin_tilde_setup();
@@ -1383,6 +1385,8 @@ void* Setup::createReceiver(void* ptr, char const* s,
 void Setup::initialisePdLua(char const* datadir, char* vers, int const vers_len, void (*register_class_callback)(char const*))
 {
     pdlua_setup(datadir, vers, vers_len, register_class_callback);
+  comport_setup();
+
 }
 
 void Setup::initialisePdInstance()