diff --git a/.drone.yml b/.drone.yml
index 2b5407e0df61dd74799c403b421f0ed3b501469f..35ed0c7459394fd9101def311fe7a1d06933bb79 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -33,6 +33,13 @@ pipeline:
     when:
       matrix:
         TESTS: signed-off-check
+  htaccess-checker:
+    image: nextcloudci/php7.0:php7.0-2
+    commands:
+      - php ./build/htaccess-checker.php
+    when:
+      matrix:
+        TESTS: htaccess-checker
   syntax-php5.6:
     image: nextcloudci/php5.6:php5.6-2
     commands:
@@ -332,6 +339,7 @@ pipeline:
 matrix:
   include:
     - TESTS: signed-off-check
+    - TESTS: htaccess-checker
     - TESTS: nodb-codecov
     - TESTS: db-codecov    
     - TESTS: integration-capabilities_features
diff --git a/build/htaccess-checker.php b/build/htaccess-checker.php
new file mode 100644
index 0000000000000000000000000000000000000000..b6932d6543ac3b8f51268ea20c86656955d17922
--- /dev/null
+++ b/build/htaccess-checker.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * @copyright Copyright (c) 2016 Lukas Reschke <lukas@statuscode.ch>
+ *
+ * @author Lukas Reschke <lukas@statuscode.ch>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * Script to check that the main .htaccess file doesn't include some automated
+ * changes done by Nextcloud.
+ */
+
+$htaccess = file_get_contents(__DIR__ . '/../.htaccess');
+if(strpos($htaccess, 'DO NOT CHANGE ANYTHING') !== false) {
+	echo(".htaccess file has invalid changes!\n");
+	exit(1);
+} else {
+	exit(0);
+}