diff --git a/apps/calendar/appinfo/app.php b/apps/calendar/appinfo/app.php
index b02fc602c6..055066de0d 100755
--- a/apps/calendar/appinfo/app.php
+++ b/apps/calendar/appinfo/app.php
@@ -23,3 +23,6 @@ OCP\App::addNavigationEntry( array(
   'name' => $l->t('Calendar')));
 OCP\App::registerPersonal('calendar', 'settings');
 OC_Search::registerProvider('OC_Search_Provider_Calendar');
+if(!file_exists(OC::$SERVERROOT.'/remote/caldav.php')){
+	file_put_contents(OC::$SERVERROOT.'/remote/caldav.php', file_get_contents(OC::$APPSROOT . '/apps/calendar/appinfo/remote.php'));
+}
\ No newline at end of file
diff --git a/apps/calendar/appinfo/install.php b/apps/calendar/appinfo/install.php
deleted file mode 100644
index fc5cd89239..0000000000
--- a/apps/calendar/appinfo/install.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-if(!file_exists(OC::$WEBROOT.'/remote/caldav.php')){
-	file_put_contents(OC::$WEBROOT.'/remote/caldav.php', file_get_contents(OC::$APPSROOT . '/apps/calendar/appinfo/remote.php'));
-}
diff --git a/apps/calendar/appinfo/update.php b/apps/calendar/appinfo/update.php
index 13d711b84c..ce7f304a49 100755
--- a/apps/calendar/appinfo/update.php
+++ b/apps/calendar/appinfo/update.php
@@ -14,7 +14,4 @@ if (version_compare($installedVersion, '0.2.1', '<')) {
 		$stmt = OCP\DB::prepare( 'UPDATE *PREFIX*calendar_calendars SET calendarcolor=? WHERE id=?' );
 		$r = $stmt->execute(array($color,$id));
 	}
-}
-if(!file_exists(OC::$WEBROOT.'/remote/caldav.php')){
-	file_put_contents(OC::$WEBROOT.'/remote/caldav.php', file_get_contents(OC::$APPSROOT . '/apps/calendar/appinfo/remote.php'));
 }
\ No newline at end of file
diff --git a/apps/contacts/appinfo/app.php b/apps/contacts/appinfo/app.php
index e5e1d572f2..c8c1d779da 100755
--- a/apps/contacts/appinfo/app.php
+++ b/apps/contacts/appinfo/app.php
@@ -25,3 +25,6 @@ OCP\App::addNavigationEntry( array(
 OCP\App::registerPersonal('contacts','settings');
 OCP\Util::addscript('contacts', 'loader');
 OC_Search::registerProvider('OC_Search_Provider_Contacts');
+if(!file_exists(OC::$SERVERROOT.'/remote/carddav.php')){
+	file_put_contents(OC::$SERVERROOT.'/remote/carddav.php', file_get_contents(OC::$APPSROOT . '/apps/contacts/appinfo/remote.php'));
+}
\ No newline at end of file
diff --git a/apps/contacts/appinfo/install.php b/apps/contacts/appinfo/install.php
deleted file mode 100644
index 172ace5b1a..0000000000
--- a/apps/contacts/appinfo/install.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-if(!file_exists(OC::$WEBROOT.'/remote/carddav.php')){
-	file_put_contents(OC::$WEBROOT.'/remote/carddav.php', file_get_contents(OC::$APPSROOT . '/apps/contacts/appinfo/remote.php'));
-}
diff --git a/apps/contacts/appinfo/update.php b/apps/contacts/appinfo/update.php
deleted file mode 100644
index 29bde6c052..0000000000
--- a/apps/contacts/appinfo/update.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-if(!file_exists(OC::$WEBROOT.'/remote/carddav.php')){
-	file_put_contents(OC::$WEBROOT.'/remote/carddav.php', file_get_contents(OC::$APPSROOT . '/apps/contacts/appinfo/remote.php'));
-}
\ No newline at end of file
diff --git a/apps/files/appinfo/app.php b/apps/files/appinfo/app.php
index 355b77d5e7..5611acd2ab 100755
--- a/apps/files/appinfo/app.php
+++ b/apps/files/appinfo/app.php
@@ -9,3 +9,6 @@ OCP\App::registerAdmin('files','admin');
 OCP\App::addNavigationEntry( array( "id" => "files_index", "order" => 0, "href" => OCP\Util::linkTo( "files", "index.php" ), "icon" => OCP\Util::imagePath( "core", "places/home.svg" ), "name" => $l->t("Files") ));
 
 OC_Search::registerProvider('OC_Search_Provider_File');
+if(!file_exists(OC::$SERVERROOT.'/remote/webdav.php')){
+	file_put_contents(OC::$SERVERROOT.'/remote/webdav.php', file_get_contents(OC::$APPSROOT . '/apps/files/appinfo/webdav.php'));
+}
\ No newline at end of file
diff --git a/apps/files/appinfo/install.php b/apps/files/appinfo/install.php
deleted file mode 100644
index 8c1430900a..0000000000
--- a/apps/files/appinfo/install.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-if(!file_exists(OC::$WEBROOT.'/remote/webdav.php')){
-	file_put_contents(OC::$WEBROOT.'/remote/webdav.php', file_get_contents(OC::$APPSROOT . '/apps/files/appinfo/webdav.php'));
-}
diff --git a/apps/files/appinfo/update.php b/apps/files/appinfo/update.php
deleted file mode 100644
index f7ad31f651..0000000000
--- a/apps/files/appinfo/update.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-if(!file_exists(OC::$WEBROOT.'/remote/webdav.php')){
-	file_put_contents(OC::$WEBROOT.'/remote/webdav.php', file_get_contents(OC::$APPSROOT . '/apps/files/appinfo/webdav.php'));
-}
\ No newline at end of file