diff --git a/config/CAN_INSTALL b/config/CAN_INSTALL
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/core/Controller/SetupController.php b/core/Controller/SetupController.php
index 17d7b51d3f..00f32889ee 100644
--- a/core/Controller/SetupController.php
+++ b/core/Controller/SetupController.php
@@ -62,6 +62,11 @@ class SetupController {
 			$post['dbpass'] = $post['dbpassword'];
 		}
 
+		if (!is_file(\OC::$configDir.'/CAN_INSTALL')) {
+			$this->displaySetupForbidden();
+			return;
+		}
+
 		if(isset($post['install']) AND $post['install']=='true') {
 			// We have to launch the installation process :
 			$e = $this->setupHelper->install($post);
@@ -79,6 +84,10 @@ class SetupController {
 		}
 	}
 
+	private function displaySetupForbidden() {
+		\OC_Template::printGuestPage('', 'installation_forbidden');
+	}
+
 	public function display($post) {
 		$defaults = array(
 			'adminlogin' => '',
@@ -103,6 +112,13 @@ class SetupController {
 			unlink($this->autoConfigFile);
 		}
 		\OC::$server->getIntegrityCodeChecker()->runInstanceVerification();
+
+		if (\OC_Util::getChannel() !== 'git' && is_file(\OC::$configDir.'/CAN_INSTALL')) {
+			if (!unlink(\OC::$configDir.'/CAN_INSTALL')) {
+				\OC_Template::printGuestPage('', 'installation_incomplete');
+			}
+		}
+
 		\OC_Util::redirectToDefaultPage();
 	}
 
diff --git a/core/templates/installation_forbidden.php b/core/templates/installation_forbidden.php
new file mode 100644
index 0000000000..743d14b133
--- /dev/null
+++ b/core/templates/installation_forbidden.php
@@ -0,0 +1,6 @@
+<div class="error">
+	<h2><?php p($l->t('Error')) ?></h2>
+	<p>
+		<?php p($l->t('It looks like you are trying to reinstall your Nextcloud. However the file CAN_INSTALL is missing from your config directory. Please create the file CAN_INSTALL in your config folder to continue.')) ?>
+	</p>
+</div>
diff --git a/core/templates/installation_incomplete.php b/core/templates/installation_incomplete.php
new file mode 100644
index 0000000000..867f637d70
--- /dev/null
+++ b/core/templates/installation_incomplete.php
@@ -0,0 +1,6 @@
+<div class="error">
+	<h2><?php p($l->t('Error')) ?></h2>
+	<p>
+		<?php p($l->t('Could not remove CAN_INSTALL from the config folder. Please remove this file manually.')) ?>
+	</p>
+</div>
diff --git a/lib/private/Updater.php b/lib/private/Updater.php
index 4b4723be94..fa4e165e58 100644
--- a/lib/private/Updater.php
+++ b/lib/private/Updater.php
@@ -111,6 +111,13 @@ class Updater extends BasicEmitter {
 			$this->emit('\OC\Updater', 'maintenanceEnabled');
 		}
 
+		// Clear CAN_INSTALL file if not on git
+		if (\OC_Util::getChannel() !== 'git' && is_file(\OC::$configDir.'/CAN_INSTALL')) {
+			if (!unlink(\OC::$configDir . '/CAN_INSTALL')) {
+				$this->log->error('Could not cleanup CAN_INSTALL from your config folder. Please remove this file manually.');
+			}
+		}
+
 		$installedVersion = $this->config->getSystemValue('version', '0.0.0');
 		$currentVersion = implode('.', \OCP\Util::getVersion());