diff --git a/README.rdoc b/README.rdoc
index e151309..b9a719c 100644
--- a/README.rdoc
+++ b/README.rdoc
@@ -1,6 +1,11 @@
 = Redmine Join Project
 
-A Redmine plugin to allow non-members to join a project in Redmine
+A Redmine plugin to allow non-members to join a project in Redmine. Now compatible with Redmine 2.x.
+
+Supported languages:
+
+* English
+* Spanish
 
 == Features
 
@@ -18,11 +23,10 @@ A copy of the plugin can be downloaded from {Little Stream Software}[https://pro
 == Installation and Setup
 
 1. Follow the Redmine plugin installation steps at: http://www.redmine.org/wiki/redmine/Plugins 
-2. Run the plugin migrations +rake db:migrate_plugins+
+2. Run the plugin migrations "+rake db:migrate_plugins+" or "bundle exec rake redmine:plugins:migrate RAILS_ENV=production"
 3. Restart your Redmine web servers (e.g. mongrel, thin, mod_rails)
 4. Login to Redmine as an Administrator
-5. Configure the permissions for the plugin: 'Approve Project Join Requests'
-5. Configure the plugin (below)
+5. Configure the plugin (below) going to /settings/plugin/redmine_simple_join_project
 6. Setup any projects that allow non-members to join
 
 == Plugin configuration
diff --git a/Rakefile b/Rakefile
index c23e217..c444ef2 100755
--- a/Rakefile
+++ b/Rakefile
@@ -1,3 +1,4 @@
+#encoding: utf-8
 #!/usr/bin/env ruby
 require 'redmine_plugin_support'
 
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 16998c3..105bd1d 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1,7 +1,7 @@
 # English strings go here for Rails i18n
 en:
-  join_project_text_join_project: Contributing to this Project
-  join_project_text_join_this_project: Contribute to this project
+  join_project_text_join_project: "Contributing to this Project"
+  join_project_text_join_this_project: "Contribute to this project"
   join_project_text_settings_configuration: "Configuration"
   join_project_settings_help: "Select which roles each new project member should receive by default"
   join_project_missing_roles: "Missing Role.  Please create at least one first."
@@ -12,16 +12,16 @@ en:
   join_project_text_accept_request: "Accept request"
   join_project_text_decline_request: "Decline request"
   join_project_text_project_join_requests: "Project Join Requests"
-  join_project_text_request_to_join_subject: Request to Join
-  join_project_text_declined_request_to_join_this_project_subject: Declined request to join to this project
-  join_project_text_accepted_request_to_join_this_project_subject: Accepted request to join to this project
+  join_project_text_request_to_join_subject: "Request to Join"
+  join_project_text_declined_request_to_join_this_project_subject: "Declined request to join to this project"
+  join_project_text_accepted_request_to_join_this_project_subject: "Accepted request to join to this project"
   join_project_text_your_request_to_join_was_declined: "Your request to join %{project} was declined."
   join_project_text_your_request_to_join_was_accepted: "Your request to join %{project} was accepted."
-  join_project_unlogged_info: |
-    If you are interested in contributing to this project, you may request to join it. In order to do that, you must sign in first.
-  join_project_log_in_link: Sign in
-  join_project_request_to_join_this_project_info: |
+  join_project_unlogged_info: "|
+    If you are interested in contributing to this project, you may request to join it. In order to do that, you must sign in first."
+  join_project_log_in_link: "Sign in"
+  join_project_request_to_join_this_project_info: "|
     If you want to contribute to this project, use the link below to request to join. Your request will
-    be sent to the project manager for approval.
-  join_project_request_to_join_this_project_link: Request to join this project
+    be sent to the project manager for approval."
+  join_project_request_to_join_this_project_link: "Request to join this project"
 
diff --git a/config/locales/es.yml b/config/locales/es.yml
new file mode 100644
index 0000000..9c07dca
--- /dev/null
+++ b/config/locales/es.yml
@@ -0,0 +1,26 @@
+# Spanish strings go here for Rails i18n
+es:
+  join_project_text_join_project: "Colaborar con este proyecto"
+  join_project_text_join_this_project: "Colaborar con este proyecto"
+  join_project_text_settings_configuration: "Configuración"
+  join_project_settings_help: "Elige que roles debe recibir un nuevo miembro del proyecto por defecto"
+  join_project_missing_roles: "No hay roles. Debe crear al menos un rol"
+  join_project_error_cant_join: "No se puede sumar al proyecto."
+  join_project_successful_request: "Tu solicitud para sumarte a este prouecto fue enviada. El/los administradores del mismo serán notificados."
+  join_project_successful_decline: "Solicitud rechazada"
+  join_project_setting_email_content: "Cuerpo del mensaje"
+  join_project_text_accept_request: "Aceptar solicitud"
+  join_project_text_decline_request: "Rechazar solicitud"
+  join_project_text_project_join_requests: "Solicitudes pendientes"
+  join_project_text_request_to_join_subject: "Request to Join"
+  join_project_text_declined_request_to_join_this_project_subject: "Solicitud para sumarse a proyecto fue rechazada"
+  join_project_text_accepted_request_to_join_this_project_subject: "Accepted request to join to this project"
+  join_project_text_your_request_to_join_was_declined: "Tu solicitud para sumarte al proyecto %{project} fue rechazada."
+  join_project_text_your_request_to_join_was_accepted: "Tu solicitud para sumarte al proyecto %{project} fue aceptada."
+  join_project_unlogged_info: "|
+    Si estar interesado en contribuir con este proyecto, puedes solicitar ser incorporado al mismo. Para hacerlo, primero debes ingresar con tu usuario."
+  join_project_log_in_link: "Ingresar ahora"
+  join_project_request_to_join_this_project_info: "|
+    Si estar interesado en contribuir con este proyecto, puedes solicitar ser incorporado al mismo usando el siguiente enlace. Tu solicitud será evaluada por el administrador del proyecto."
+  join_project_request_to_join_this_project_link: "Quiero sumarme a este proyecto"
+
diff --git a/init.rb b/init.rb
index c62438b..f127b2d 100644
--- a/init.rb
+++ b/init.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'redmine'
 
 require 'simple_join_project/hooks/layout_hooks'
diff --git a/lang/es.yml b/lang/es.yml
new file mode 100644
index 0000000..a0e3acc
--- /dev/null
+++ b/lang/es.yml
@@ -0,0 +1,2 @@
+# English strings go here
+my_label: "Mi etiqueta"