diff --git a/addressfield.info b/addressfield.info
index 61fd73a..c5751a3 100644
--- a/addressfield.info
+++ b/addressfield.info
@@ -10,6 +10,7 @@ files[] = includes/addressfield_form_default.inc
 files[] = includes/addressfield_form_br.inc
 files[] = includes/addressfield_form_gb.inc
 files[] = includes/addressfield_form_us.inc
+files[] = includes/addressfield_form_es.inc
 
 ; Information added by drupal.org packaging script on January 1, 1970 - 00:00
 version = "7.x-1.x-dev"
diff --git a/addressfield.module b/addressfield.module
index 3b4abd6..68f90cd 100644
--- a/addressfield.module
+++ b/addressfield.module
@@ -576,6 +576,7 @@ function addressfield_default_mapping() {
     'default' => 'AddressFieldForm_default',
     'BR' => 'AddressFieldForm_br',
     'GB' => 'AddressFieldForm_gb',
+    'ES' => 'AddressFieldForm_es',
     'US' => 'AddressFieldForm_us',
     // TODO: complete the mapping.
   );