diff --git a/drush/jquerymobile.drush.inc b/drush/jquerymobile.drush.inc
index 81257f1..643fdba 100644
--- a/drush/jquerymobile.drush.inc
+++ b/drush/jquerymobile.drush.inc
@@ -48,6 +48,11 @@ function jquerymobile_drush_command() {
  *
  */
 function drush_jquerymobile() {
+  if (!function_exists('make_download_file')) {
+    drush_log(dt('This command requires Drush 5.x or Drush Make', array()), 'error');
+    return FALSE;
+  }
+
   $jqm = drush_get_option('jqm');
   $jquery = drush_get_option('jquery');
   $path = drush_get_option('path');
@@ -67,52 +72,17 @@ function drush_jquerymobile() {
   $path = drush_get_context('DRUSH_DRUPAL_ROOT') . '/' . $path;
   
   // Download jQuery Mobile
-  if (!is_dir($path)) {
-    drush_op('mkdir', $path);
-    drush_log(dt('Directory @path was created', array('@path' => $path)), 'notice');
-  }
-  
-  drush_op('chdir', $path);
-  if (drush_shell_exec('wget http://code.jquery.com/mobile/' . $jqm . '/jquery.mobile-' . $jqm . '.zip')) {
-    drush_log(dt('jquery.mobile-' . $jqm . '.zip has been downloaded to @path', array('@path' => $path)), 'success');
-  }
-  else {
-    drush_log(dt('Drush was unable to download jquery.mobile-' . $jqm . '.zip to @path', array('@path' => $path)), 'error');
-  }
-  
-  if (drush_shell_exec('unzip jquery.mobile-' . $jqm . '.zip')) {
-    drush_log(dt('jquery.mobile-' . $jqm . '.zip has been extacted to @path', array('@path' => $path)), 'success');
-  }
-  else {
-    drush_log(dt('Drush was unable to extract jquery.mobile-' . $jqm . '.zip to @path', array('@path' => $path)), 'error');
-  }
-  
-  if (drush_shell_exec('rm jquery.mobile-' . $jqm . '.zip')) {
-    drush_log(dt('jquery.mobile-' . $jqm . '.zip has been removed from @path', array('@path' => $path)), 'success');
-  }
-  else {
-    drush_log(dt('Drush was unable to remove jquery.mobile-' . $jqm . '.zip from @path', array('@path' => $path)), 'error');
-  } 
-  
+  drush_mkdir($path . '/jquery.mobile');
+  make_download_file( 'jquerymobile', array('url' => "http://code.jquery.com/mobile/$jqm/jquery.mobile-$jqm.zip"), $path . '/jquery.mobile');
+
   // Download jQuery
   $files = array('.js', '.min.js');
 
-  if (!is_dir($path . '/jquery-' . $jquery)) {
-    drush_op('mkdir', $path . '/jquery-' . $jquery);
-    drush_log(dt('Directory @path was created', array('@path' => $path . '/jquery-' . $jquery)), 'notice');
-  }
-  
-  drush_op('chdir', $path . '/jquery-' . $jquery);
-
+  drush_mkdir($path . '/jquery');
   foreach ($files as $key => $file) {
-    if (drush_shell_exec('wget http://code.jquery.com/jquery-' . $jquery . $file)) {
-      drush_log(dt('jquery-' . $jquery . $file . ' has been downloaded to @path', array('@path' => $path . '/jquery-' . $jquery)), 'success');
-    }
-    else {
-      drush_log(dt('Drush was unable to download jquery-' . $jquery . $file . ' to @path', array('@path' => $path . '/jquery-' . $jquery)), 'error');
-    }
+    make_download_file( 'jquerymobile', array('url' => 'http://code.jquery.com/jquery-' . $jquery . $file), $path . '/jquery');
   }
-  
+
   variable_set('jquerymobile_jquerymobile_version', $jqm);
   variable_set('jquerymobile_jquery_version', $jquery);
 }
diff --git a/jquerymobile.module b/jquerymobile.module
index 42780a3..f58a4bc 100755
--- a/jquerymobile.module
+++ b/jquerymobile.module
@@ -119,8 +119,8 @@ function jquerymobile_library() {
       $option = 'external';
       break;
     default:
-      $jqm_path = $path  . '/jquery.mobile-' . variable_get('jquerymobile_jquerymobile_version', '1.0.1');
-      $jquery_path = $path . '/jquery-' . variable_get('jquerymobile_jquery_version', '1.6.4');
+      $jqm_path = $path  . '/jquery.mobile';
+      $jquery_path = $path . '/jquery';
       $option = 'file';
       break;
   }