diff --git a/README.txt b/README.txt
index 7c05487..cf72dbc 100644
--- a/README.txt
+++ b/README.txt
@@ -27,21 +27,19 @@ Facebook API key: http://www.facebook.com/developers/
 
 
 -- INSTALLATION --
-  1. Upload the 'fbconnect' folder into your module directory and activate the module,
+  1. Upload the 'fbconnect' and 'libraries' folder into your module directory and activate
+     the modules,
 
-  2. Upload facebook-php-sdk/src/facebook.php (http://github.com/facebook/php-sdk/) into fbconnect module folder (or into libraries folder,
-    if you want to use it with the libraries module, http://drupal.org/project/libraries)
-
-     To ensure that you installed correctly check file : <fbconnect folder>/facebook.php must be accessible
-     OR /sites/all/libraries/facebook/facebook.php must be accessible
+  2. Upload facebook-php-sdk library (http://github.com/facebook/php-sdk/) into the libraries
+     folder
 
  -- OR --
   Use drush_make script instead of steps 1 and 2:
-
-projects[] = fbconnect
-libraries[facebook-php-sdk][download][type] = "get"
-libraries[facebook-php-sdk][download][url] = "http://github.com/facebook/php-sdk/tarball/v2.1.1"
-libraries[facebook-php-sdk][destination] = "modules/fbconnect"
+    projects[] = libraries
+    projects[] = fbconnect
+    libraries[facebook-php-sdk][download][type] = "get"
+    libraries[facebook-php-sdk][download][url] = "http://github.com/facebook/php-sdk/tarball/v3.1.1"
+    libraries[facebook-php-sdk][destination] = "libraries"
 
   3. Create a new facebook application: http://www.facebook.com/developers/createapp.php
 
diff --git a/fbconnect.info b/fbconnect.info
index 53ddd67..17ace7a 100644
--- a/fbconnect.info
+++ b/fbconnect.info
@@ -1,4 +1,6 @@
 name = Fbconnect
+dependencies[] = libraries
 description = Allows users to connect with Facebook account
 package = "Authentication"
 core = 7.x
+
diff --git a/fbconnect.module b/fbconnect.module
index 9f72484..86dbcec 100644
--- a/fbconnect.module
+++ b/fbconnect.module
@@ -318,36 +318,52 @@ function fbconnect_render_button($attr = array()) {
   return theme('fbconnect_login_button', array('text' => $text, 'attr' => $attr));
 }
 
-function _facebook_client_search_paths() {
-  return array_filter(array(
-    drupal_get_path('module', 'fbconnect') . '/facebook-php-sdk',
-    module_invoke('libraries', 'get_path', 'facebook-php-sdk'),
-    drupal_get_path('module', 'fbconnect') . '/facebook-client',
-    drupal_get_path('module', 'fbconnect'),
-    module_invoke('libraries', 'get_path', 'facebook-platform'),
-    module_invoke('libraries', 'get_path', 'facebook-client'),
-  ));
+/*
+ *  add Libraries API support, see: http://drupal.org/project/libraries
+ *
+ *  implement hook_libraries_info()
+ */
+function fbconnect_libraries_info() {
+  // Returns an associative array, with information about external library
+  $libraries['facebook-php-sdk'] = array(
+    'name' => 'Facebook PHP SDK',
+    'vendor url' => 'https://github.com/facebook/php-sdk',
+    'download url' => 'https://github.com/facebook/php-sdk/tarball/v3.1.1',
+    'version arguments' => array(
+      'file' => 'readme.md',
+      // Best practice: Document the actual version strings for later reference.
+      // 3.1.1:  Facebook PHP SDK (v.3.1.1), filters for 3.x.x versions
+      'pattern' => '/Facebook PHP SDK \(v.3.\d.\d\)/',
+      'lines' => 10,
+    ),
+    // supported library version, including relevant files
+    'versions' => array(
+      'Facebook PHP SDK (v.3.1.1)' => array(
+        'files' => array(
+          'php' => array(
+            'src/base_facebook.php',
+            'src/facebook.php',
+          ),
+        ),
+      ),
+    ),
+  );
+  return $libraries;
 }
 
+/**
+ * It locates and loads the Facebook PHP SDK library
+ */
 function _facebook_client_load_include() {
-  // TODO: add full Libraries API support.
   if (!class_exists('Facebook')) {
-    $paths = array(
-      DRUPAL_ROOT . '/sites/all/libraries/facebook',
-      dirname(__FILE__),
-    );
-    foreach ($paths as $path) {
-      $path .= '/facebook.php';
-      if (file_exists($path)) {
-        include $path;
-        break;
-      }
-    }
-    if (!class_exists('Facebook')) {
-      watchdog('fbconnect', 'Unable to load the required Facebook library, please check the README.txt for instructions on how to resolve this.');
+    module_load_include('module', 'libraries');
+    $library = libraries_load('facebook-php-sdk');
+    if ($library['loaded']) {
+      watchdog('fbconnect', t('Facebook library loaded'));
+    } else {
+      watchdog('fbconnect', t('Unable to load the required Facebook library, please check the README.txt for instructions on how to resolve this.'));
     }
   }
-
   return class_exists('Facebook') && defined('Facebook::VERSION');
 }