diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index ca79ceb8b..7fb92b5e3 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -16,7 +16,7 @@
 //= require jquery-ui/datepicker-es
 //= require foundation
 //= require turbolinks
-//= require ckeditor/init
+//= require ckeditor/loader
 //= require_directory ./ckeditor
 //= require social-share-button
 //= require initial
diff --git a/app/assets/javascripts/ckeditor/loader.js.erb b/app/assets/javascripts/ckeditor/loader.js.erb
new file mode 100644
index 000000000..66e1d8347
--- /dev/null
+++ b/app/assets/javascripts/ckeditor/loader.js.erb
@@ -0,0 +1,3 @@
+//= require ckeditor/init
+
+CKEDITOR.config.customConfig = '<%= javascript_path 'ckeditor/config.js' %>';
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index 942ba99c8..e5fc916f0 100644
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -9,7 +9,7 @@ Rails.application.config.assets.version = '1.0'
 # Precompile additional assets.
 # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
 # Rails.application.config.assets.precompile += %w( search.js )
-Rails.application.config.assets.precompile += %w( ckeditor/* )
+Rails.application.config.assets.precompile += %w( ckeditor/config.js )
 Rails.application.config.assets.precompile += %w( ie_lt9.js )
 Rails.application.config.assets.precompile += %w( stat_graphs.js )
 Rails.application.config.assets.precompile += %w( print.css )
diff --git a/config/initializers/ckeditor.rb b/config/initializers/ckeditor.rb
new file mode 100644
index 000000000..58e119048
--- /dev/null
+++ b/config/initializers/ckeditor.rb
@@ -0,0 +1,4 @@
+Ckeditor.setup do |config|
+  config.assets_languages = I18n.available_locales.map(&:to_s)
+  config.assets_plugins = []
+end