diff --git a/apps/user_webfinger/appinfo/app.php b/apps/user_webfinger/appinfo/app.php
index f7b927df82a92edda0f939475eaf2510120d1bb7..ffdbe9263e0ce929180500f6d19d380a93cc21aa 100755
--- a/apps/user_webfinger/appinfo/app.php
+++ b/apps/user_webfinger/appinfo/app.php
@@ -3,3 +3,4 @@ OCP\App::register( array(
   'order' => 11,
   'id' => 'user_webfinger',
   'name' => 'Webfinger' ));
+OCP\CONFIG::setAppValue('core', 'public_webfinger', '/apps/user_webfinger/webfinger.php');
diff --git a/apps/user_webfinger/appinfo/install.php b/apps/user_webfinger/appinfo/install.php
index c8d9a4274253c363e5438246e348f55ce86c8f22..00a533e781b32a6f5a7fff315c5853b389ffd2ec 100644
--- a/apps/user_webfinger/appinfo/install.php
+++ b/apps/user_webfinger/appinfo/install.php
@@ -19,7 +19,7 @@ $lrddTmpl = 'http';
 if(isset($_SERVER['HTTPS'])) {
     $lrddTmpl .= 's';
 }
-$lrddTmpl .= '://' . $serverName . $webRoot . '/apps/user_webfinger/webfinger.php?q={uri}';
+$lrddTmpl .= '://' . $serverName . $webRoot . '/public.php?service=webfinger&q={uri}';
 $hostMetaPath = $docRoot . '/.well-known/host-meta';
 $hostMetaDir = $docRoot . '/.well-known';
 $hostMetaContents = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
diff --git a/apps/user_webfinger/webfinger.php b/apps/user_webfinger/webfinger.php
index 307a1630019a271aaae3b4599fdeb7643bb93438..4ea9b80c98ce9533c6f61678f3b5bf5ddf2a2e08 100755
--- a/apps/user_webfinger/webfinger.php
+++ b/apps/user_webfinger/webfinger.php
@@ -25,8 +25,6 @@ $SUBURI=substr(realpath($_SERVER["SCRIPT_FILENAME"]),strlen($SERVERROOT));
 $WEBROOT=substr($SUBURI,0,-34);
 */
 
-require_once('../../lib/base.php');
-
 $userName = '';
 $hostName = '';
 $request = strip_tags(urldecode($_GET['q']));