diff --git a/.gitmodules b/.gitmodules
index 9acb468a..4b6f7f5c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,8 +1,8 @@
 [submodule "lib/i3ipcpp"]
 	path = lib/i3ipcpp
-	url = https://github.com/jaagr/i3ipcpp
-	branch = v0.7.0
+	url = https://github.com/polybar/i3ipcpp
+	branch = master
 [submodule "lib/xpp"]
 	path = lib/xpp
-	url = https://github.com/jaagr/xpp
-	branch = 1.4.0
+	url = https://github.com/polybar/xpp
+	branch = master
diff --git a/lib/i3ipcpp b/lib/i3ipcpp
index d4e4786b..21ce9060 160000
--- a/lib/i3ipcpp
+++ b/lib/i3ipcpp
@@ -1 +1 @@
-Subproject commit d4e4786be35b48d72dc7e59cf85ec34a90d129b5
+Subproject commit 21ce9060ac7c502225fdbd2f200b1cbdd8eca08d