diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 96f4e67..22981cf 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1190,7 +1190,7 @@ module ApplicationHelper
                      "beforeShow: beforeShowDatePicker};")
         jquery_locale = l('jquery.locale', :default => current_language.to_s)
         unless jquery_locale == 'en'
-          tags << javascript_include_tag("i18n/jquery.ui.datepicker-#{jquery_locale}.js")
+          tags << javascript_include_tag("i18n/datepicker-#{jquery_locale}.js")
         end
         tags
       end
diff --git a/public/javascripts/i18n/jquery.ui.datepicker-ar.js b/public/javascripts/i18n/datepicker-ar.js
similarity index 100%
rename from public/javascripts/i18n/jquery.ui.datepicker-ar.js
rename to public/javascripts/i18n/datepicker-ar.js
diff --git a/public/javascripts/i18n/jquery.ui.datepicker-az.js b/public/javascripts/i18n/datepicker-az.js
similarity index 100%
rename from public/javascripts/i18n/jquery.ui.datepicker-az.js
rename to public/javascripts/i18n/datepicker-az.js
diff --git a/public/javascripts/i18n/jquery.ui.datepicker-bg.js b/public/javascripts/i18n/datepicker-bg.js
similarity index 100%
rename from public/javascripts/i18n/jquery.ui.datepicker-bg.js
rename to public/javascripts/i18n/datepicker-bg.js
diff --git a/public/javascripts/i18n/jquery.ui.datepicker-bs.js b/public/javascripts/i18n/datepicker-bs.js
similarity index 100%
rename from public/javascripts/i18n/jquery.ui.datepicker-bs.js
rename to public/javascripts/i18n/datepicker-bs.js
diff --git a/public/javascripts/i18n/jquery.ui.datepicker-ca.js b/public/javascripts/i18n/datepicker-ca.js
similarity index 100%
rename from public/javascripts/i18n/jquery.ui.datepicker-ca.js
rename to public/javascripts/i18n/datepicker-ca.js
diff --git a/public/javascripts/i18n/jquery.ui.datepicker-cs.js b/public/javascripts/i18n/datepicker-cs.js
similarity index 100%
rename from public/javascripts/i18n/jquery.ui.datepicker-cs.js
rename to public/javascripts/i18n/datepicker-cs.js
diff --git a/public/javascripts/i18n/jquery.ui.datepicker-da.js b/public/javascripts/i18n/datepicker-da.js
similarity index 100%
rename from public/javascripts/i18n/jquery.ui.datepicker-da.js
rename to public/javascripts/i18n/datepicker-da.js
diff --git a/public/javascripts/i18n/jquery.ui.datepicker-de.js b/public/javascripts/i18n/datepicker-de.js
similarity index 100%
rename from public/javascripts/i18n/jquery.ui.datepicker-de.js
rename to public/javascripts/i18n/datepicker-de.js
diff --git a/public/javascripts/i18n/jquery.ui.datepicker-el.js b/public/javascripts/i18n/datepicker-el.js
similarity index 100%
rename from public/javascripts/i18n/jquery.ui.datepicker-el.js
rename to public/javascripts/i18n/datepicker-el.js
diff --git a/public/javascripts/i18n/jquery.ui.datepicker-en-GB.js b/public/javascripts/i18n/datepicker-en-GB.js
similarity index 100%
rename from public/javascripts/i18n/jquery.ui.datepicker-en-GB.js
rename to public/javascripts/i18n/datepicker-en-GB.js
diff --git a/public/javascripts/i18n/jquery.ui.datepicker-es.js b/public/javascripts/i18n/datepicker-es.js
similarity index 100%
rename from public/javascripts/i18n/jquery.ui.datepicker-es.js
rename to public/javascripts/i18n/datepicker-es.js
diff --git a/public/javascripts/i18n/jquery.ui.datepicker-et.js b/public/javascripts/i18n/datepicker-et.js
similarity index 100%
rename from public/javascripts/i18n/jquery.ui.datepicker-et.js
rename to public/javascripts/i18n/datepicker-et.js
diff --git a/public/javascripts/i18n/jquery.ui.datepicker-eu.js b/public/javascripts/i18n/datepicker-eu.js
similarity index 100%
rename from public/javascripts/i18n/jquery.ui.datepicker-eu.js
rename to public/javascripts/i18n/datepicker-eu.js
diff --git a/public/javascripts/i18n/jquery.ui.datepicker-fa.js b/public/javascripts/i18n/datepicker-fa.js
similarity index 100%
rename from public/javascripts/i18n/jquery.ui.datepicker-fa.js
rename to public/javascripts/i18n/datepicker-fa.js
diff --git a/public/javascripts/i18n/jquery.ui.datepicker-fi.js b/public/javascripts/i18n/datepicker-fi.js
similarity index 100%
rename from public/javascripts/i18n/jquery.ui.datepicker-fi.js
rename to public/javascripts/i18n/datepicker-fi.js
diff --git a/public/javascripts/i18n/jquery.ui.datepicker-fr.js b/public/javascripts/i18n/datepicker-fr.js
similarity index 100%
rename from public/javascripts/i18n/jquery.ui.datepicker-fr.js
rename to public/javascripts/i18n/datepicker-fr.js
diff --git a/public/javascripts/i18n/jquery.ui.datepicker-gl.js b/public/javascripts/i18n/datepicker-gl.js
similarity index 100%
rename from public/javascripts/i18n/jquery.ui.datepicker-gl.js
rename to public/javascripts/i18n/datepicker-gl.js
diff --git a/public/javascripts/i18n/jquery.ui.datepicker-he.js b/public/javascripts/i18n/datepicker-he.js
similarity index 100%
rename from public/javascripts/i18n/jquery.ui.datepicker-he.js
rename to public/javascripts/i18n/datepicker-he.js
diff --git a/public/javascripts/i18n/jquery.ui.datepicker-hr.js b/public/javascripts/i18n/datepicker-hr.js
similarity index 100%
rename from public/javascripts/i18n/jquery.ui.datepicker-hr.js
rename to public/javascripts/i18n/datepicker-hr.js
diff --git a/public/javascripts/i18n/jquery.ui.datepicker-hu.js b/public/javascripts/i18n/datepicker-hu.js
similarity index 100%
rename from public/javascripts/i18n/jquery.ui.datepicker-hu.js
rename to public/javascripts/i18n/datepicker-hu.js
diff --git a/public/javascripts/i18n/jquery.ui.datepicker-id.js b/public/javascripts/i18n/datepicker-id.js
similarity index 100%
rename from public/javascripts/i18n/jquery.ui.datepicker-id.js
rename to public/javascripts/i18n/datepicker-id.js
diff --git a/public/javascripts/i18n/jquery.ui.datepicker-it.js b/public/javascripts/i18n/datepicker-it.js
similarity index 100%
rename from public/javascripts/i18n/jquery.ui.datepicker-it.js
rename to public/javascripts/i18n/datepicker-it.js
diff --git a/public/javascripts/i18n/jquery.ui.datepicker-ja.js b/public/javascripts/i18n/datepicker-ja.js
similarity index 100%
rename from public/javascripts/i18n/jquery.ui.datepicker-ja.js
rename to public/javascripts/i18n/datepicker-ja.js
diff --git a/public/javascripts/i18n/jquery.ui.datepicker-ko.js b/public/javascripts/i18n/datepicker-ko.js
similarity index 100%
rename from public/javascripts/i18n/jquery.ui.datepicker-ko.js
rename to public/javascripts/i18n/datepicker-ko.js
diff --git a/public/javascripts/i18n/jquery.ui.datepicker-lt.js b/public/javascripts/i18n/datepicker-lt.js
similarity index 100%
rename from public/javascripts/i18n/jquery.ui.datepicker-lt.js
rename to public/javascripts/i18n/datepicker-lt.js
diff --git a/public/javascripts/i18n/jquery.ui.datepicker-lv.js b/public/javascripts/i18n/datepicker-lv.js
similarity index 100%
rename from public/javascripts/i18n/jquery.ui.datepicker-lv.js
rename to public/javascripts/i18n/datepicker-lv.js
diff --git a/public/javascripts/i18n/jquery.ui.datepicker-mk.js b/public/javascripts/i18n/datepicker-mk.js
similarity index 100%
rename from public/javascripts/i18n/jquery.ui.datepicker-mk.js
rename to public/javascripts/i18n/datepicker-mk.js
diff --git a/public/javascripts/i18n/jquery.ui.datepicker-nl.js b/public/javascripts/i18n/datepicker-nl.js
similarity index 100%
rename from public/javascripts/i18n/jquery.ui.datepicker-nl.js
rename to public/javascripts/i18n/datepicker-nl.js
diff --git a/public/javascripts/i18n/jquery.ui.datepicker-no.js b/public/javascripts/i18n/datepicker-no.js
similarity index 100%
rename from public/javascripts/i18n/jquery.ui.datepicker-no.js
rename to public/javascripts/i18n/datepicker-no.js
diff --git a/public/javascripts/i18n/jquery.ui.datepicker-pl.js b/public/javascripts/i18n/datepicker-pl.js
similarity index 100%
rename from public/javascripts/i18n/jquery.ui.datepicker-pl.js
rename to public/javascripts/i18n/datepicker-pl.js
diff --git a/public/javascripts/i18n/jquery.ui.datepicker-pt-BR.js b/public/javascripts/i18n/datepicker-pt-BR.js
similarity index 100%
rename from public/javascripts/i18n/jquery.ui.datepicker-pt-BR.js
rename to public/javascripts/i18n/datepicker-pt-BR.js
diff --git a/public/javascripts/i18n/jquery.ui.datepicker-pt.js b/public/javascripts/i18n/datepicker-pt.js
similarity index 100%
rename from public/javascripts/i18n/jquery.ui.datepicker-pt.js
rename to public/javascripts/i18n/datepicker-pt.js
diff --git a/public/javascripts/i18n/jquery.ui.datepicker-ro.js b/public/javascripts/i18n/datepicker-ro.js
similarity index 100%
rename from public/javascripts/i18n/jquery.ui.datepicker-ro.js
rename to public/javascripts/i18n/datepicker-ro.js
diff --git a/public/javascripts/i18n/jquery.ui.datepicker-ru.js b/public/javascripts/i18n/datepicker-ru.js
similarity index 100%
rename from public/javascripts/i18n/jquery.ui.datepicker-ru.js
rename to public/javascripts/i18n/datepicker-ru.js
diff --git a/public/javascripts/i18n/jquery.ui.datepicker-sk.js b/public/javascripts/i18n/datepicker-sk.js
similarity index 100%
rename from public/javascripts/i18n/jquery.ui.datepicker-sk.js
rename to public/javascripts/i18n/datepicker-sk.js
diff --git a/public/javascripts/i18n/jquery.ui.datepicker-sl.js b/public/javascripts/i18n/datepicker-sl.js
similarity index 100%
rename from public/javascripts/i18n/jquery.ui.datepicker-sl.js
rename to public/javascripts/i18n/datepicker-sl.js
diff --git a/public/javascripts/i18n/jquery.ui.datepicker-sq.js b/public/javascripts/i18n/datepicker-sq.js
similarity index 100%
rename from public/javascripts/i18n/jquery.ui.datepicker-sq.js
rename to public/javascripts/i18n/datepicker-sq.js
diff --git a/public/javascripts/i18n/jquery.ui.datepicker-sr.js b/public/javascripts/i18n/datepicker-sr.js
similarity index 100%
rename from public/javascripts/i18n/jquery.ui.datepicker-sr.js
rename to public/javascripts/i18n/datepicker-sr.js
diff --git a/public/javascripts/i18n/jquery.ui.datepicker-sv.js b/public/javascripts/i18n/datepicker-sv.js
similarity index 100%
rename from public/javascripts/i18n/jquery.ui.datepicker-sv.js
rename to public/javascripts/i18n/datepicker-sv.js
diff --git a/public/javascripts/i18n/jquery.ui.datepicker-th.js b/public/javascripts/i18n/datepicker-th.js
similarity index 100%
rename from public/javascripts/i18n/jquery.ui.datepicker-th.js
rename to public/javascripts/i18n/datepicker-th.js
diff --git a/public/javascripts/i18n/jquery.ui.datepicker-tr.js b/public/javascripts/i18n/datepicker-tr.js
similarity index 100%
rename from public/javascripts/i18n/jquery.ui.datepicker-tr.js
rename to public/javascripts/i18n/datepicker-tr.js
diff --git a/public/javascripts/i18n/jquery.ui.datepicker-uk.js b/public/javascripts/i18n/datepicker-uk.js
similarity index 100%
rename from public/javascripts/i18n/jquery.ui.datepicker-uk.js
rename to public/javascripts/i18n/datepicker-uk.js
diff --git a/public/javascripts/i18n/jquery.ui.datepicker-vi.js b/public/javascripts/i18n/datepicker-vi.js
similarity index 100%
rename from public/javascripts/i18n/jquery.ui.datepicker-vi.js
rename to public/javascripts/i18n/datepicker-vi.js
diff --git a/public/javascripts/i18n/jquery.ui.datepicker-zh-CN.js b/public/javascripts/i18n/datepicker-zh-CN.js
similarity index 100%
rename from public/javascripts/i18n/jquery.ui.datepicker-zh-CN.js
rename to public/javascripts/i18n/datepicker-zh-CN.js
diff --git a/public/javascripts/i18n/jquery.ui.datepicker-zh-TW.js b/public/javascripts/i18n/datepicker-zh-TW.js
similarity index 100%
rename from public/javascripts/i18n/jquery.ui.datepicker-zh-TW.js
rename to public/javascripts/i18n/datepicker-zh-TW.js
diff --git a/test/integration/layout_test.rb b/test/integration/layout_test.rb
index c5284bd..b2e85cd 100644
--- a/test/integration/layout_test.rb
+++ b/test/integration/layout_test.rb
@@ -73,37 +73,37 @@ class LayoutTest < ActionController::IntegrationTest
   def test_calendar_header_tags
     with_settings :default_language => 'fr' do
       get '/issues'
-      assert_include "/javascripts/i18n/jquery.ui.datepicker-fr.js", response.body
+      assert_include "/javascripts/i18n/datepicker-fr.js", response.body
     end
 
     with_settings :default_language => 'en-GB' do
       get '/issues'
-      assert_include "/javascripts/i18n/jquery.ui.datepicker-en-GB.js", response.body
+      assert_include "/javascripts/i18n/datepicker-en-GB.js", response.body
     end
 
     with_settings :default_language => 'en' do
       get '/issues'
-      assert_not_include "/javascripts/i18n/jquery.ui.datepicker", response.body
+      assert_not_include "/javascripts/i18n/datepicker", response.body
     end
 
     with_settings :default_language => 'zh' do
       get '/issues'
-      assert_include "/javascripts/i18n/jquery.ui.datepicker-zh-CN.js", response.body
+      assert_include "/javascripts/i18n/datepicker-zh-CN.js", response.body
     end
 
     with_settings :default_language => 'zh-TW' do
       get '/issues'
-      assert_include "/javascripts/i18n/jquery.ui.datepicker-zh-TW.js", response.body
+      assert_include "/javascripts/i18n/datepicker-zh-TW.js", response.body
     end
 
     with_settings :default_language => 'pt' do
       get '/issues'
-      assert_include "/javascripts/i18n/jquery.ui.datepicker-pt.js", response.body
+      assert_include "/javascripts/i18n/datepicker-pt.js", response.body
     end
 
     with_settings :default_language => 'pt-BR' do
       get '/issues'
-      assert_include "/javascripts/i18n/jquery.ui.datepicker-pt-BR.js", response.body
+      assert_include "/javascripts/i18n/datepicker-pt-BR.js", response.body
     end
   end