diff --git a/help/index.php b/help/index.php
index dafbd05cf3..fe20c1c4ab 100644
--- a/help/index.php
+++ b/help/index.php
@@ -8,27 +8,12 @@ if( !OC_USER::isLoggedIn()){
 }
 
 OC_APP::setActiveNavigationEntry( "help" );
-$settings = array();
 
-// Do the work ...
-if( $_POST["submit"] )
-{
-    if( $_POST["newpassword"] != $_POST["newpasswordconfirm"] ){
-        // Say "Passwords not equal"
-    }
-    else{
-        if( OC_USER::checkPassword( $_SESSION["username"], $_POST["password"] )){
-            // Set password
-            OC_USER::setPassord( $_SESSION["username"], $_POST["newpassword"] );
-        }
-        else{
-            // Say "old password bad"
-        }
-    }
-}
+$kbe=OC_OCSCLIENT::getKnownledgebaseEntries();
+
 
 $tmpl = new OC_TEMPLATE( "help", "index", "user" );
-$tmpl->assign( "settings", $settings );
+$tmpl->assign( "kbe", $kbe );
 $tmpl->printPage();
 
 ?>
diff --git a/help/templates/index.php b/help/templates/index.php
index 19b0fa8e7f..89674e0187 100644
--- a/help/templates/index.php
+++ b/help/templates/index.php
@@ -1 +1,17 @@
-This is self-explanatory. Why are you here?
+<?php
+/*
+ * Template for settings page
+ */
+?>
+<h1>Help</h1>
+
+<table cellspacing="0">
+	<tbody>
+		<?php foreach($_["kbe"] as $kb): ?>
+			<tr>
+				<td width="1"><?php if($kb["preview"] <> "") { echo('<a href="'.OC_HELPER::linkTo( "help", "index.php" ).'?id='.$kb['id'].'"><img class="preview" border="0" src="'.$kb["preview"].'" /></a>'); } ?> </a></td>
+				<td class="name"><a href="<?php echo(OC_HELPER::linkTo( "help", "index.php" ).'?id='.$kb['id']); ?>" title=""><?php echo $kb["name"]; ?></a><br /><?php  echo('<span class="type">'.$kb['description'].'</span>'); ?></td>
+			</tr>
+		<?php endforeach; ?>
+	</tbody>
+</table>
diff --git a/lib/ocsclient.php b/lib/ocsclient.php
index 921bd5489a..9f6a79e747 100644
--- a/lib/ocsclient.php
+++ b/lib/ocsclient.php
@@ -114,6 +114,29 @@ class OC_OCSCLIENT{
                 return $app;
         }
 
+        /**
+         * @brief Get all the knowledgebase entries from the OCS server
+         * @returns array with q and a data
+         *
+         * This function returns a list of all the knowledgebase entries from the OCS server
+         */
+        public static function getKnownledgebaseEntries(){
+                $url='http://api.opendesktop.org/v1/knowledgebase/data?page=0&pagesize=10';
+
+                $kbe=array();
+                $xml=file_get_contents($url);
+                $data=simplexml_load_string($xml);
+
+                $tmp=$data->data->content;
+                for($i = 0; $i < count($tmp); $i++) {
+                        $kb=array();
+                        $kb['id']=$tmp[$i]->id;
+                        $kb['name']=$tmp[$i]->name;
+                        $kb['description']=$tmp[$i]->description;
+                        $kbe[]=$kb;
+                }
+                return $kb;
+        }
 
 
 
diff --git a/plugins/publiclink/plugin.xml b/plugins/publiclink/plugin.xml
deleted file mode 100755
index 75abed6cf0..0000000000
--- a/plugins/publiclink/plugin.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<plugin version="1.0">
-	<info>
-		<id>publiclink</id>
-		<name>Simple file sharing by creating a public link to a file</name>
-		<version>0.1</version>
-		<licence>AGPL</licence>
-		<author>Robin Appelman</author>
-		<require>1.1</require>
-	</info>
-	<runtime>
-		<include>lib_public.php</include>
-	</runtime>
-	<install>
-		<database>db_structure.xml</database>
-	</install>
-</plugin>