diff --git a/app/AppKernel.php b/app/AppKernel.php
index e2db75a72..e8160135e 100644
--- a/app/AppKernel.php
+++ b/app/AppKernel.php
@@ -2,6 +2,7 @@
 
 use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\Config\Loader\LoaderInterface;
+use Wallabag\ApiBundle\WallabagApiBundle;
 
 class AppKernel extends Kernel
 {
@@ -20,6 +21,7 @@ class AppKernel extends Kernel
             new JMS\SerializerBundle\JMSSerializerBundle(),
             new Nelmio\ApiDocBundle\NelmioApiDocBundle(),
             new Wallabag\CoreBundle\WallabagCoreBundle(),
+            new Wallabag\ApiBundle\WallabagApiBundle(),
         );
 
         if (in_array($this->getEnvironment(), array('dev', 'test'))) {
diff --git a/app/config/routing.yml b/app/config/routing.yml
index a57311dc0..60fcb6f4b 100644
--- a/app/config/routing.yml
+++ b/app/config/routing.yml
@@ -10,7 +10,7 @@ doc-api:
     resource: "@NelmioApiDocBundle/Resources/config/routing.yml"
     prefix: /api/doc
 
-rest :
-    type : rest
-    resource : "routing_rest.yml"
-    prefix : /api
\ No newline at end of file
+wallabag_api:
+    resource: "@WallabagApiBundle/Controller/"
+    type:     annotation
+    prefix:   /api
\ No newline at end of file
diff --git a/app/config/routing_rest.yml b/app/config/routing_rest.yml
deleted file mode 100644
index ecddbd360..000000000
--- a/app/config/routing_rest.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-app_api :
-    type: rest
-    resource:     "WallabagCoreBundle:Api"
-    name_prefix:  api_
\ No newline at end of file
diff --git a/src/Wallabag/ApiBundle/Controller/EntryController.php b/src/Wallabag/ApiBundle/Controller/EntryController.php
new file mode 100644
index 000000000..07ca8ccf3
--- /dev/null
+++ b/src/Wallabag/ApiBundle/Controller/EntryController.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Wallabag\ApiBundle\Controller;
+
+use Nelmio\ApiDocBundle\Annotation\ApiDoc;
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Wallabag\CoreBundle\Entity\Entries;
+use FOS\RestBundle\Controller\Annotations\Get;
+use Wallabag\CoreBundle\Entity\Users;
+
+class EntryController extends Controller
+{
+    /**
+     * Fetch an entry for a given user
+     *
+     * @Get("/u/{user}/entry/{entry}")
+     * @ApiDoc(
+     *      requirements={
+     *          {"name"="user", "dataType"="string", "requirement"="\w+", "description"="The username"},
+     *          {"name"="entry", "dataType"="integer", "requirement"="\w+", "description"="The entry ID"}
+     *      }
+     * )
+     * @return Entries
+     */
+    public function getAction(Users $user, Entries $entry)
+    {
+        return $entry;
+    }
+}
diff --git a/src/Wallabag/ApiBundle/WallabagApiBundle.php b/src/Wallabag/ApiBundle/WallabagApiBundle.php
new file mode 100644
index 000000000..19d887aba
--- /dev/null
+++ b/src/Wallabag/ApiBundle/WallabagApiBundle.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Wallabag\ApiBundle;
+
+use Symfony\Component\HttpKernel\Bundle\Bundle;
+
+class WallabagApiBundle extends Bundle
+{
+}
diff --git a/src/Wallabag/CoreBundle/Controller/ApiController.php b/src/Wallabag/CoreBundle/Controller/ApiController.php
deleted file mode 100644
index ac06701ce..000000000
--- a/src/Wallabag/CoreBundle/Controller/ApiController.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-namespace Wallabag\CoreBundle\Controller;
-
-use Nelmio\ApiDocBundle\Annotation\ApiDoc;
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
-use Wallabag\CoreBundle\Entity\Entries;
-
-class ApiController extends Controller
-{
-    /**
-     * @ApiDoc(
-     *  resource=true,
-     *  description="This is a demo method. Just remove it",
-     * )
-     */
-    public function getEntryAction()
-    {
-        return new Entries('Blobby');
-    }
-}