diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..a2e2556
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "bacnet_stack"]
+	path = bacnet_stack
+	url = https://git.tonycloud.org/dali/bacnet_stack.git
diff --git a/bacnet_stack b/bacnet_stack
new file mode 160000
index 0000000..b1f4389
--- /dev/null
+++ b/bacnet_stack
@@ -0,0 +1 @@
+Subproject commit b1f4389f3171155a90c3d0a29d520e28d6461483
diff --git a/components/gateway_bacnet/CMakeLists.txt b/components/gateway_bacnet/CMakeLists.txt
index 6dadc22..e2d9462 100644
--- a/components/gateway_bacnet/CMakeLists.txt
+++ b/components/gateway_bacnet/CMakeLists.txt
@@ -6,7 +6,7 @@ if(NOT CONFIG_GATEWAY_BACNET_BRIDGE_SUPPORTED)
     return()
 endif()
 
-set(BACNET_STACK_ROOT "${CMAKE_CURRENT_LIST_DIR}/../../../bacnet-stack")
+set(BACNET_STACK_ROOT "${CMAKE_CURRENT_LIST_DIR}/../../bacnet_stack")
 set(BACNET_SRC_ROOT "${BACNET_STACK_ROOT}/src")
 set(BACNET_ESP32_PORT "${BACNET_STACK_ROOT}/ports/esp32/src")
 idf_build_get_property(IDF_PATH IDF_PATH)