diff --git a/Controller/PhotoController.php b/Controller/PhotoController.php
index a816fcc..f952e3a 100644
--- a/Controller/PhotoController.php
+++ b/Controller/PhotoController.php
@@ -7,9 +7,6 @@
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\Security\Core\Exception\AccessDeniedException;
 
-use Zend\Paginator\Paginator;
-use Zend\Paginator\Adapter\ArrayAdapter;
-
 use FOQ\AlbumBundle\Model\AlbumInterface;
 use FOQ\AlbumBundle\Document\Photo;
 
diff --git a/Provider/AbstractProvider.php b/Provider/AbstractProvider.php
index 4a83f28..3dfa311 100644
--- a/Provider/AbstractProvider.php
+++ b/Provider/AbstractProvider.php
@@ -5,9 +5,9 @@
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Doctrine\ODM\MongoDB\Query\Builder;
 
-use Zend\Paginator\Paginator;
-use ZendPaginatorAdapter\DoctrineMongoDBAdapter;
-use Zend\Paginator\Adapter\ArrayAdapter;
+use Pagerfanta\Pagerfanta;
+use Pagerfanta\Adapter\DoctrineODMMongoDBAdapter;
+use Pagerfanta\Adapter\ArrayAdapter;
 
 abstract class AbstractProvider
 {
@@ -57,15 +57,13 @@ protected function getUser($username)
     protected function paginate($data)
     {
         if ($data instanceof Builder) {
-            $adapter = new DoctrineMongoDBAdapter($data);
+            $adapter = new DoctrineODMMongoDBAdapter($data);
         } else {
             $adapter = new ArrayAdapter($data);
         }
-        $paginator = new Paginator($adapter);
-
-        $paginator->setCurrentPageNumber($this->request->get('page', 1));
-        $paginator->setItemCountPerPage($this->getItemCountPerPage());
-        $paginator->setPageRange($this->getPageRange());
+        $paginator = new Pagerfanta($adapter);
+        $paginator->setCurrentPage($this->request->get('page', 1));
+        $paginator->setMaxPerPage($this->getItemCountPerPage());
 
         return $paginator;
     }
diff --git a/Provider/PhotoProvider.php b/Provider/PhotoProvider.php
index 57c3b7c..900ac1a 100644
--- a/Provider/PhotoProvider.php
+++ b/Provider/PhotoProvider.php
@@ -11,9 +11,6 @@
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Doctrine\ODM\MongoDB\Query\Builder;
 use Doctrine\ODM\MongoDB\DocumentManager;
-use Zend\Paginator\Paginator;
-use ZendPaginatorAdapter\DoctrineMongoDBAdapter;
-use Zend\Paginator\Adapter\ArrayAdapter;
 
 /**
  * High level object finder that uses the route parameters as method arguments