diff --git a/libraries.info b/libraries.info
index 208a14e..c01fa0a 100644
--- a/libraries.info
+++ b/libraries.info
@@ -1,4 +1,4 @@
 name = Libraries
-description = Allows version dependent and shared usage of external libraries.
+description = Allows version-dependent and shared usage of external libraries.
 core = 7.x
 files[] = tests/libraries.test
diff --git a/libraries.module b/libraries.module
index b86b448..7c23c3c 100644
--- a/libraries.module
+++ b/libraries.module
@@ -65,30 +65,28 @@ function libraries_get_path($name, $base_path = FALSE) {
  * @ingroup libraries
  */
 function libraries_get_libraries() {
-  $directory = 'libraries';
   $searchdir = array();
-  $profile = drupal_get_profile();
+  $profile = drupal_get_path('profile', drupal_get_profile());
   $config = conf_path();
 
   // Similar to 'modules' and 'themes' directories in the root directory,
   // certain distributions may want to place libraries into a 'libraries'
   // directory in Drupal's root directory.
-  $searchdir[] = $directory;
-
-  // The 'profiles' directory contains pristine collections of modules and
-  // themes as organized by a distribution.  It is pristine in the same way
-  // that /modules is pristine for core; users should avoid changing anything
-  // there in favor of sites/all or sites/<domain> directories.
-  if (file_exists("profiles/$profile/$directory")) {
-    $searchdir[] = "profiles/$profile/$directory";
+  $searchdir[] = 'libraries';
+
+  // Similar to 'modules' and 'themes' directories inside an installation
+  // profile, installation profiles may want to place libraries into a
+  // 'libraries' directory.
+  if (file_exists("$profile/libraries")) {
+    $searchdir[] = "$profile/libraries";
   }
 
-  // Always search sites/all/*.
-  $searchdir[] = 'sites/all/' . $directory;
+  // Always search sites/all/libraries.
+  $searchdir[] = 'sites/all/libraries';
 
   // Also search sites/<domain>/*.
-  if (file_exists("$config/$directory")) {
-    $searchdir[] = "$config/$directory";
+  if (file_exists("$config/libraries")) {
+    $searchdir[] = "$config/libraries";
   }
 
   // Retrieve list of directories.
@@ -126,13 +124,13 @@ function libraries_get_libraries() {
  *   the files.
  */
 function libraries_scan_info_files() {
-  $profile = drupal_get_profile();
+  $profile = drupal_get_path('profile', drupal_get_profile());
   $config = conf_path();
 
   // Build a list of directories.
   $directories = module_invoke_all('libraries_info_file_paths');
   $directories[] = 'libraries';
-  $directories[] = "profiles/$profile/libraries";
+  $directories[] = "$profile/libraries";
   $directories[] = 'sites/all/libraries';
   $directories[] = "$config/libraries";