diff --git a/modules/rhizomatica_base_system/files/var/lib/locales/supported.d/local b/modules/rhizomatica_base_system/files/var/lib/locales/supported.d/local
new file mode 100644
index 0000000..d81023b
--- /dev/null
+++ b/modules/rhizomatica_base_system/files/var/lib/locales/supported.d/local
@@ -0,0 +1,3 @@
+en_US.UTF-8 UTF-8
+es_ES ISO-8859-1
+es_ES.UTF-8 UTF-8
diff --git a/modules/rhizomatica_base_system/manifests/init.pp b/modules/rhizomatica_base_system/manifests/init.pp
index 7cc94b9..bc0c359 100644
--- a/modules/rhizomatica_base_system/manifests/init.pp
+++ b/modules/rhizomatica_base_system/manifests/init.pp
@@ -163,11 +163,17 @@ class rhizomatica_base_system {
     }
 
   exec { 'locale-gen':
-      command     => '/usr/sbin/locale-gen es_ES.utf8',
-      require     => File['/var/rhizomatica/rccn/config_values.py'],
+      command     => '/usr/sbin/locale-gen',
+      require     => [ File['/var/rhizomatica/rccn/config_values.py'],
+      File['/var/lib/locales/supported.d/local'] ],
       refreshonly => true,
       }
 
+  file { '/var/lib/locales/supported.d/local':
+      ensure      => present,
+      source      => 'puppet:///modules/rhizomatica_base_system/var/lib/locales/supported.d/local',
+    }
+
   file { '/var/www/html/rai':
       ensure  => link,
       target  => '/var/rhizomatica/rai',