diff --git a/core/doc/admin/index.html b/core/doc/admin/index.html
index 7785f2ce2f1..a5c91e82219 100644
--- a/core/doc/admin/index.html
+++ b/core/doc/admin/index.html
@@ -1,2 +1,2 @@
 Here goes the admin documentation.
-In the meantime go to <a href="http://owncloud.org/support/" target="_blank">ownCloud.org/support</a>
+In the meantime go to <a href="https://docs.nextcloud.org/server/9/admin_manual/" target="_blank">docs.nextcloud.org</a>
diff --git a/core/doc/user/index.html b/core/doc/user/index.html
index ede62f05aee..e2580fed4ab 100644
--- a/core/doc/user/index.html
+++ b/core/doc/user/index.html
@@ -1,2 +1,2 @@
-Here goes the user documentation
-In the meantime go to <a href="http://owncloud.org/support/" target="_blank">ownCloud.org/support</a>
+Here goes the user documentation.
+In the meantime go to <a href="https://docs.nextcloud.org/server/9/user_manual/" target="_blank">docs.nextcloud.org</a>
diff --git a/lib/private/app.php b/lib/private/app.php
index a126b5b0495..5d0909de2a5 100644
--- a/lib/private/app.php
+++ b/lib/private/app.php
@@ -381,9 +381,7 @@ class OC_App {
 
 		$settings = array();
 		// by default, settings only contain the help menu
-		/*
-		 * FIXME: Add help sidebar back once documentation is properly branded.
-		 * if (OC_Util::getEditionString() === '' &&
+		if (OC_Util::getEditionString() === '' &&
 			\OC::$server->getSystemConfig()->getValue('knowledgebaseenabled', true) == true
 		) {
 			$settings = array(
@@ -395,7 +393,7 @@ class OC_App {
 					"icon" => $urlGenerator->imagePath("settings", "help.svg")
 				)
 			);
-		}*/
+		}
 
 		// if the user is logged-in
 		if (OC_User::isLoggedIn()) {
diff --git a/lib/private/defaults.php b/lib/private/defaults.php
index 7eee2dc75c7..3e31291c648 100644
--- a/lib/private/defaults.php
+++ b/lib/private/defaults.php
@@ -59,8 +59,8 @@ class OC_Defaults {
 		$this->defaultiOSClientUrl = 'https://itunes.apple.com/us/app/owncloud/id543672169?mt=8';
 		$this->defaultiTunesAppId = '543672169';
 		$this->defaultAndroidClientUrl = 'https://play.google.com/store/apps/details?id=com.owncloud.android';
-		$this->defaultDocBaseUrl = 'https://doc.owncloud.org';
-		$this->defaultDocVersion = $version[0] . '.' . $version[1]; // used to generate doc links
+		$this->defaultDocBaseUrl = 'https://docs.nextcloud.org';
+		$this->defaultDocVersion = $version[0]; // used to generate doc links
 		$this->defaultSlogan = $this->l->t('a safe home for all your data');
 		$this->defaultLogoClaim = '';
 		$this->defaultMailHeaderColor = '#0082c9'; /* header color of mail notifications */
diff --git a/settings/templates/help.php b/settings/templates/help.php
index 79584aba84d..f248abc066c 100644
--- a/settings/templates/help.php
+++ b/settings/templates/help.php
@@ -16,19 +16,19 @@
 	<?php } ?>
 
 		<li>
-			<a href="https://owncloud.org/support" target="_blank" rel="noreferrer">
+			<a href="https://docs.nextcloud.org/" target="_blank" rel="noreferrer">
 				<?php p($l->t('Online documentation')); ?> ↗
 			</a>
 		</li>
 		<li>
-			<a href="https://forum.owncloud.org" target="_blank" rel="noreferrer">
+			<a href="https://help.nextcloud.com" target="_blank" rel="noreferrer">
 				<?php p($l->t('Forum')); ?> ↗
 			</a>
 		</li>
 
 	<?php if($_['admin']) { ?>
 		<li>
-			<a href="https://github.com/owncloud/core/blob/master/CONTRIBUTING.md"
+			<a href="https://github.com/nextcloud/server/blob/master/CONTRIBUTING.md"
 				target="_blank" rel="noreferrer">
 				<?php p($l->t('Issue tracker')); ?> ↗
 			</a>
@@ -36,7 +36,7 @@
 	<?php } ?>
 
 	<li>
-		<a href="https://owncloud.com/subscriptions/" target="_blank" rel="noreferrer">
+		<a href="https://nextcloud.com/enterprise/" target="_blank" rel="noreferrer">
 			<?php p($l->t('Commercial support')); ?> ↗
 		</a>
 	</li>