diff --git a/jplayer.module b/jplayer.module
index fc4100d..df44f77 100644
--- a/jplayer.module
+++ b/jplayer.module
@@ -474,17 +474,27 @@ function jplayer_add_core_js() {
     ),
   );
   drupal_add_js($settings, array('type' => 'setting'));
-
+  // Check for the existence of an alternative version of jplayer.js and jplayer.css
+  global $theme_key;
+  $theme_path = drupal_get_path('theme',$theme_key);
+  $loadable_js =  drupal_get_path('module', 'jplayer') . '/theme/jplayer.js';
+  if ($path = file_exists(DRUPAL_ROOT.'/'.$theme_path.'/jplayer/jplayer.js')) {
+      $loadable_js = $theme_path.'/jplayer/jplayer.js';
+  }
+  $loadable_css = drupal_get_path('module', 'jplayer') . '/theme/jplayer.css';
+  if ($path = file_exists(DRUPAL_ROOT.'/'.$theme_path.'/jplayer/jplayer.css')) {
+      $loadable_css = $theme_path.'/jplayer/jplayer.css';
+  }
   return array(
     '#attached' => array(
       'library' => array(
         array('jplayer', 'jplayer'),
       ),
       'js' => array(
-        drupal_get_path('module', 'jplayer') . '/theme/jplayer.js' => array('type' => 'file', 'scope' => 'footer', 'group' => JS_DEFAULT),
+        $loadable_js => array('type' => 'file', 'scope' => 'footer', 'group' => JS_DEFAULT),
       ),
       'css' => array(
-        drupal_get_path('module', 'jplayer') . '/theme/jplayer.css' => array('type' => 'file', 'group' => CSS_DEFAULT),
+        $loadable_css => array('type' => 'file', 'group' => CSS_DEFAULT),
       ),
     ),
   );