diff --git a/servers/rest_server/rest_server.install b/servers/rest_server/rest_server.install
index 12ebe46..69c0e93 100644
--- a/servers/rest_server/rest_server.install
+++ b/servers/rest_server/rest_server.install
@@ -9,22 +9,21 @@
  */
 function rest_server_requirements($phase) {
   $requirements = array();
-  // Ensure translations don't break at install time
-  $t = get_t();
 
+  // Report the version of libraries.
   if ($phase == 'runtime') {
-    module_load_include('module', 'rest_server');
-    module_load_include('module', 'libraries');
-    if (($library = libraries_load('spyc')) && empty($library['loaded'])) {
-      $requirements['rest_server'] = array(
-        'description' => 'The spyc library is missing, thus YAML is disabled',
-        'severity' => REQUIREMENT_INFO,
-        'value' => $t('To enable YAML HTTP requests/responses, please download <a href="@download">spyc</a> and create a file called spyc.php in rest_server/lib or use Libraries to retrieve spyc.', 
-                      array('@download' =>  'http://code.google.com/p/spyc/downloads/list')),
-        'title' => t('Missing spyc library'),
+    drupal_load('module', 'libraries');
+    $libraries = rest_server_libraries_info();
+    foreach ($libraries as $name => $info) {
+      $library = libraries_detect($name);
+      $requirements[$name] = array(
+        'title' => $library['name'],
+        'severity' => $library['installed'] ? REQUIREMENT_OK : REQUIREMENT_WARNING,
+        'value' => $library['installed'] ? l($library['version'], $library['vendor url']) : $library['error message'],
       );
     }
   }
+  
   return $requirements;
 }
 
diff --git a/servers/rest_server/rest_server.module b/servers/rest_server/rest_server.module
index e65d020..1cc3a7f 100755
--- a/servers/rest_server/rest_server.module
+++ b/servers/rest_server/rest_server.module
@@ -175,21 +175,21 @@ function _rest_server_add_default_and_remove_unknown(&$array, $keys, $default) {
 
 /**
  * Implements hook_libraries_info().
- * @note : Libraries 2.x
  */
 function rest_server_libraries_info() {
   $libraries['spyc'] = array(
-    'name' => 'Spyc (A simple YAML loader/dumper class for PHP)',
-    'vendor url' => 'https://code.google.com/p/spyc/',
-    'download url' => 'https://code.google.com/p/spyc/downloads/list',
+    'name' => 'Spyc',
+    'version' => '0.5.1',
+    'vendor url' => 'https://github.com/mustangostang/spyc',
+    'download url' => 'https://github.com/mustangostang/spyc/archive/master.zip',
     'version arguments' => array(
-      'file' => 'spyc.php',
+      'file' => 'Spyc.php',
       'pattern' => '@version\s+([0-9a-zA-Z\.-]+)@',
-      'lines' => 4
     ),
     'files' => array(
-      'php' => array('spyc.php'),
+      'php' => array('Spyc.php'),
     ),
   );
+
   return $libraries;
-}
\ No newline at end of file
+}
diff --git a/services.make b/services.make
index 51b9959..25b5cbb 100644
--- a/services.make
+++ b/services.make
@@ -1,9 +1,8 @@
-; Drush Make (http://drupal.org/project/drush_make)
 api = 2
 core = 7.x
 
-libraries[spyc][download][type] = "get"
-libraries[spyc][download][url] = "https://raw.github.com/mustangostang/spyc/79f61969f63ee77e0d9460bc254a27a671b445f3/spyc.php"
-libraries[spyc][filename] = "../spyc.php"
-libraries[spyc][directory_name] = "lib"
-libraries[spyc][destination] = "modules/contrib/services/servers/rest_server"
+; Libraries
+libraries[spyc][directory_name] = spyc
+libraries[spyc][download][type] = file
+libraries[spyc][download][url] = https://github.com/mustangostang/spyc/archive/master.zip
+libraries[spyc][type] = library