diff --git a/apps/federation/appinfo/app.php b/apps/federation/appinfo/app.php
index 92b64b9c0585537961a7622548db831919e0a07e..6c53810dd2c2266c27fc25d0ffcc97971c076d8f 100644
--- a/apps/federation/appinfo/app.php
+++ b/apps/federation/appinfo/app.php
@@ -23,5 +23,4 @@
 namespace OCA\Federation\AppInfo;
 
 $app = new Application();
-$app->registerSettings();
 $app->registerHooks();
diff --git a/apps/federation/appinfo/info.xml b/apps/federation/appinfo/info.xml
index b8d697a4db2a74bdc20ba3b239bba571edc28459..da65fef2446a254be2de766e58b52ce3ca494346 100644
--- a/apps/federation/appinfo/info.xml
+++ b/apps/federation/appinfo/info.xml
@@ -5,7 +5,7 @@
 	<description>Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing.</description>
 	<licence>AGPL</licence>
 	<author>Bjoern Schiessle</author>
-	<version>1.1.0</version>
+	<version>1.1.1</version>
 	<namespace>Federation</namespace>
 	<category>other</category>
 	<dependencies>
@@ -19,4 +19,8 @@
 	<background-jobs>
 		<job>OCA\Federation\SyncJob</job>
 	</background-jobs>
+
+	<settings>
+		<admin>OCA\Federation\Settings\Admin</admin>
+	</settings>
 </info>
diff --git a/apps/federation/lib/AppInfo/Application.php b/apps/federation/lib/AppInfo/Application.php
index 5d8da05c8e1118113fad3299d923314eff881932..cdc6145dfb45fa24a5446db40c23ba6af6cd9113 100644
--- a/apps/federation/lib/AppInfo/Application.php
+++ b/apps/federation/lib/AppInfo/Application.php
@@ -51,13 +51,6 @@ class Application extends \OCP\AppFramework\App {
 		$this->registerMiddleware();
 	}
 
-	/**
-	 * register setting scripts
-	 */
-	public function registerSettings() {
-		App::registerAdmin('federation', 'settings/settings-admin');
-	}
-
 	private function registerService() {
 		$container = $this->getContainer();
 
diff --git a/apps/federation/lib/Settings/Admin.php b/apps/federation/lib/Settings/Admin.php
new file mode 100644
index 0000000000000000000000000000000000000000..eccb3237f7d811da7d359003171d1b910dea345f
--- /dev/null
+++ b/apps/federation/lib/Settings/Admin.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * @copyright Copyright (c) 2016 Arthur Schiwon <blizzz@arthur-schiwon.de>
+ *
+ * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
+ *
+ * @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/>.
+ *
+ */
+
+namespace OCA\Federation\Settings;
+
+use OCA\Federation\TrustedServers;
+use OCP\AppFramework\Http\TemplateResponse;
+use OCP\Settings\ISettings;
+
+class Admin implements ISettings {
+
+	/** @var TrustedServers */
+	private $trustedServers;
+
+	public function __construct(TrustedServers $trustedServers) {
+		$this->trustedServers = $trustedServers;
+	}
+
+	/**
+	 * @return TemplateResponse
+	 */
+	public function getForm() {
+		$parameters = [
+			'trustedServers' => $this->trustedServers->getServers(),
+			'autoAddServers' => $this->trustedServers->getAutoAddServers(),
+		];
+
+		return new TemplateResponse('federation', 'settings-admin', $parameters, '');
+	}
+
+	/**
+	 * @return string the section ID, e.g. 'sharing'
+	 */
+	public function getSection() {
+		return 'sharing';
+	}
+
+	/**
+	 * @return int whether the form should be rather on the top or bottom of
+	 * the admin section. The forms are arranged in ascending order of the
+	 * priority values. It is required to return a value between 0 and 100.
+	 *
+	 * E.g.: 70
+	 */
+	public function getPriority() {
+		return 30;
+	}
+
+}
diff --git a/apps/federation/settings/settings-admin.php b/apps/federation/settings/settings-admin.php
deleted file mode 100644
index aa21a1e9920e3116ad90420909ad5fb3a8ce2567..0000000000000000000000000000000000000000
--- a/apps/federation/settings/settings-admin.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Björn Schießle <bjoern@schiessle.org>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * 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, version 3,
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- *
- */
-
-$template = new OCP\Template('federation', 'settings-admin');
-
-$dbHandler = new \OCA\Federation\DbHandler(
-	\OC::$server->getDatabaseConnection(),
-	\OC::$server->getL10N('federation')
-);
-
-$trustedServers = new \OCA\Federation\TrustedServers(
-	$dbHandler,
-	\OC::$server->getHTTPClientService(),
-	\OC::$server->getLogger(),
-	\OC::$server->getJobList(),
-	\OC::$server->getSecureRandom(),
-	\OC::$server->getConfig(),
-	\OC::$server->getEventDispatcher()
-);
-
-$template->assign('trustedServers', $trustedServers->getServers());
-$template->assign('autoAddServers', $trustedServers->getAutoAddServers());
-
-return $template->fetchPage();