diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..d26bb98
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,6 @@
+[submodule "Libs/LibStub"]
+	path = Libs/LibStub
+	url = https://git.grml.de/rilgamon/LibStub.git
+[submodule "Libs/LibGUID"]
+	path = Libs/LibGUID
+	url = https://git.grml.de/rilgamon/LibGUID.git
diff --git a/LibCombatlog_data.lua b/LibCombatlog_data.lua
index dbb2a20..3f0a7d7 100644
--- a/LibCombatlog_data.lua
+++ b/LibCombatlog_data.lua
@@ -1,6 +1,6 @@
 local lib = LibStub:NewLibrary("LibCombatLog_data", 1)
 if not lib then return end
-local isGUID = LibStub("LibCombatLog").isGUID
+local isGUID = LibStub("LibGUID").isGUID
 local mixins = {'CreateDataObject'}
 local data_methods = data_methods or {}
 lib.mixinTargets = lib.mixinTargets or {}
diff --git a/Libs/LibGUID b/Libs/LibGUID
new file mode 160000
index 0000000..b08e75f
--- /dev/null
+++ b/Libs/LibGUID
@@ -0,0 +1 @@
+Subproject commit b08e75faa6a04d781ddfbae53fbca5fde947b7a0
diff --git a/Libs/LibStub b/Libs/LibStub
new file mode 160000
index 0000000..a42beba
--- /dev/null
+++ b/Libs/LibStub
@@ -0,0 +1 @@
+Subproject commit a42beba70f53a11f874cb6a7a1a819f63837b3cc