diff --git a/drush/modernizr.drush.inc b/drush/modernizr.drush.inc
index f30690d..bd7bf3b 100644
--- a/drush/modernizr.drush.inc
+++ b/drush/modernizr.drush.inc
@@ -82,15 +82,16 @@ function _modernizr_drush_download_dev() {
   // Depends on whether Libraries API is enabled or not.
   else {
     $drush_context = drush_get_context('DRUSH_DRUPAL_ROOT');
-    if (module_exists('libraries')) {
+
+    // Can we use Libraries API?
+    if (module_exists('libraries') && function_exists('libraries_get_path')) {
       $libraries_dir = libraries_get_path('modernizr');
-      $dir = $libraries_dir
-           ? $drush_context . '/' . $libraries_dir
-           : $drush_context . '/sites/all/libraries/modernizr';
-    }
-    else {
-      $dir = $drush_context . '/' . drupal_get_path('module', 'modernizr') . '/js';
     }
+
+    // Load the path
+    $dir = $libraries_dir
+         ? $drush_context . '/' . $libraries_dir
+         : $drush_context . '/sites/all/libraries/modernizr';
   }
 
   // Build full path including filename
diff --git a/modernizr.admin.inc b/modernizr.admin.inc
index 5b34d6f..7478f1d 100644
--- a/modernizr.admin.inc
+++ b/modernizr.admin.inc
@@ -122,7 +122,7 @@ function modernizr_generate_url() {
   $download_desc = array(
     '#theme' => 'html_tag',
     '#value' => t('The button links to a custom Modernizr build based on the tests listed above. <br/> Once you download the script, place it inside <b>!path</b> and !cc.', array(
-      '!path' => module_exists('libraries') ? 'sites/all/libraries/modernizr' : drupal_get_path('module', 'modernizr') . '/js',
+      '!path' => module_exists('libraries') ? libraries_get_path('modernizr') : 'sites/all/libraries/modernizr',
       '!cc' => l(t('clear your cache'), 'admin/config/development/performance'),
     )),
     '#tag' => 'p',
diff --git a/modernizr.module b/modernizr.module
index 7d43f7e..506e5d7 100644
--- a/modernizr.module
+++ b/modernizr.module
@@ -154,7 +154,13 @@ function modernizr_get_path() {
       }
     }
 
+    // The best location for downloaded libraries is sites/all/libraries.
+    if (is_dir('sites/all/libraries/modernizr')) {
+      $paths[] = 'sites/all/libraries/modernizr';
+    }
+
     // Check inside the module folder itself
+    // NOTE: this will be removed in 7.x-3.2
     $paths[] = drupal_get_path('module', 'modernizr');
 
     // Scan directories for files