diff --git a/.gitmodules b/.gitmodules
index e59ae4c..c5b36cf 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,6 +7,6 @@
 [submodule "submodules/qssb.h"]
 	path = submodules/qssb.h
 	url = https://gitea.quitesimple.org/crtxcr/qssb.h.git
-[submodule "submodules/maddy"]
-	path = submodules/maddy
-	url = https://github.com/progsource/maddy
+[submodule "submodules/qsmaddy"]
+	path = submodules/qsmaddy
+	url = https://gitea.quitesimple.org/crtxcr/qsmaddy
diff --git a/Makefile b/Makefile
index 214c081..a139184 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 CXXFLAGS=-std=c++17 -O0 -g -no-pie -pipe -MMD -Wall -Wextra
 RELEASE_CXXFLAGS=-std=c++17 -O3 -pipe -MMD -Wall -Wextra
 LDFLAGS=-lsqlite3 -lpthread -lcrypto -lstdc++fs -lseccomp
-INCLUDEFLAGS=-I submodules/sqlitemoderncpp/hdr -I submodules/cpp-httplib -I submodules/qssb.h -I submodules/maddy/include/
+INCLUDEFLAGS=-I submodules/sqlitemoderncpp/hdr -I submodules/cpp-httplib -I submodules/qssb.h -I submodules/qsmaddy/include/
 
 CXX=g++
 
diff --git a/submodules/maddy b/submodules/maddy
deleted file mode 160000
index adb1a91..0000000
--- a/submodules/maddy
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit adb1a910d4aadea09cb7b200f2ec204f61214596
diff --git a/submodules/qsmaddy b/submodules/qsmaddy
new file mode 160000
index 0000000..167ce39
--- /dev/null
+++ b/submodules/qsmaddy
@@ -0,0 +1 @@
+Subproject commit 167ce3943d6e27ddc862e6ce52cf5a79c5a794de