diff --git a/.gitmodules b/.gitmodules
index 3b24221882..f8fb9ee725 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "ocdoc"]
 	path = user_manual/ocdoc
-	url = https://github.com/owncloud/documentation
+	url = https://github.com/nextcloud/documentation
 	branch = master
diff --git a/user_manual/Makefile b/user_manual/Makefile
index 74c47b1333..64a1c6f1b3 100644
--- a/user_manual/Makefile
+++ b/user_manual/Makefile
@@ -42,22 +42,17 @@ help:
 clean:
 	-rm -rf $(BUILDDIR)/*
 
-html:   html-org
+html:   html-com
 
-html-all: html-release html-org html-com
+html-all: html-release html-com
 
 html-release:
 	$(SPHINXBUILD) -b html -D html_theme='owncloud_release' $(ALLSPHINXOPTS) $(BUILDDIR)/html/release
 	@echo
 	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html/release."
 
-html-org:
-	$(SPHINXBUILD) -b html -D html_theme='owncloud_org' $(ALLSPHINXOPTS) $(BUILDDIR)/html/org
-	@echo
-	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html/org."
-
 html-com:
-	$(SPHINXBUILD) -b html -D html_theme='owncloud_com' $(ALLSPHINXOPTS) $(BUILDDIR)/html/com
+	$(SPHINXBUILD) -b html -D html_theme='nextcloud_com' $(ALLSPHINXOPTS) $(BUILDDIR)/html/com
 	@echo
 	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html/com."
 
diff --git a/user_manual/ocdoc b/user_manual/ocdoc
index 343496c792..a4dcad98f9 160000
--- a/user_manual/ocdoc
+++ b/user_manual/ocdoc
@@ -1 +1 @@
-Subproject commit 343496c792616459e8204b6614fd42a1b16a6d68
+Subproject commit a4dcad98f92eeb4caef89b4e860d4359385f0697