diff --git a/.gitmodules b/.gitmodules
index b20acc71..6785426b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,3 +10,7 @@
 [submodule "packages_routing"]
 	path = packages_routing
 	url = https://github.com/openwrt-routing/packages.git
+[submodule "packages_luci"]
+	path = packages_luci
+	url = https://github.com/freifunk-gluon/luci.git
+	branch = luci-0.11
diff --git a/Makefile b/Makefile
index b14f8619..02fa5f3e 100644
--- a/Makefile
+++ b/Makefile
@@ -111,7 +111,7 @@ define FEEDS
 src-link gluon ../../packages_gluon
 src-link packages ../../packages_openwrt
 src-link routing ../../packages_routing
-src-svn luci http://svn.luci.subsignal.org/luci/tags/0.11.1/contrib/package
+src-link luci ../../packages_luci
 endef
 export FEEDS
 
diff --git a/packages_luci b/packages_luci
new file mode 160000
index 00000000..bed71078
--- /dev/null
+++ b/packages_luci
@@ -0,0 +1 @@
+Subproject commit bed710786d8a3a63f5908823e6382a51efc91003