diff --git a/components/calendar/locale/es_ES.tsx b/components/calendar/locale/es_ES.tsx
new file mode 100644
index 0000000000..6270b85ad4
--- /dev/null
+++ b/components/calendar/locale/es_ES.tsx
@@ -0,0 +1,2 @@
+import es_ES from '../../date-picker/locale/es_ES';
+export default es_ES;
diff --git a/components/date-picker/locale/es_ES.tsx b/components/date-picker/locale/es_ES.tsx
new file mode 100644
index 0000000000..08d5e5cc71
--- /dev/null
+++ b/components/date-picker/locale/es_ES.tsx
@@ -0,0 +1,17 @@
+import CalendarLocale from 'rc-calendar/lib/locale/es_ES';
+import TimePickerLocale from '../../time-picker/locale/es_ES';
+import assign from 'object-assign';
+
+// Merge into a locale object
+const locale = {
+  lang: assign({
+    placeholder: 'Seleccionar fecha',
+    rangePlaceholder: ['Fecha inicial', 'Fecha final'],
+  }, CalendarLocale),
+  timePickerLocale: assign({}, TimePickerLocale),
+};
+
+// All settings at:
+// https://github.com/ant-design/ant-design/blob/master/components/date-picker/locale/example.json
+
+export default locale;
diff --git a/components/locale-provider/es_ES.tsx b/components/locale-provider/es_ES.tsx
index 45052b7ec5..78146c3636 100644
--- a/components/locale-provider/es_ES.tsx
+++ b/components/locale-provider/es_ES.tsx
@@ -1,17 +1,21 @@
-import Pagination from 'rc-pagination/lib/locale/en_US';
-import DatePicker from '../date-picker/locale/en_US';
-import TimePicker from '../time-picker/locale/en_US';
+import Pagination from 'rc-pagination/lib/locale/es_ES';
+import DatePicker from '../date-picker/locale/es_ES';
+import TimePicker from '../time-picker/locale/es_ES';
+import Calendar from '../calendar/locale/es_ES';
 
 export default {
-  locale: 'en',
+  locale: 'es',
   Pagination,
   DatePicker,
   TimePicker,
+  Calendar,
   Table: {
     filterTitle: 'Filtrar Menu',
     filterConfirm: 'OK',
     filterReset: 'Resetear',
     emptyText: 'No Hay Datos',
+    selectAll: 'Seleccionar Todo',
+    selectInvert: 'Invertir Selección',
   },
   Modal: {
     okText: 'OK',
@@ -24,8 +28,17 @@ export default {
   },
   Transfer: {
     notFoundContent: 'No Encontrado',
-    searchPlaceholder: 'Buscar Aquí',
+    searchPlaceholder: 'Buscar aquí',
     itemUnit: 'item',
     itemsUnit: 'items',
   },
+  Select: {
+    notFoundContent: 'No Encontrado',
+  },
+  Upload: {
+    uploading: 'Subiendo...',
+    removeFile: 'Eliminar archivo',
+    uploadError: 'Error de subida',
+    previewFile: 'Vista previa',
+  },
 };
diff --git a/components/time-picker/locale/es_ES.tsx b/components/time-picker/locale/es_ES.tsx
new file mode 100644
index 0000000000..cfd60a8b93
--- /dev/null
+++ b/components/time-picker/locale/es_ES.tsx
@@ -0,0 +1,5 @@
+const locale = {
+  placeholder: 'Seleccionar hora',
+};
+
+export default locale;
diff --git a/package.json b/package.json
index 2412321b6a..21a883e2bd 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
     "rc-input-number": "~3.4.4",
     "rc-menu": "~5.0.9",
     "rc-notification": "~1.4.0",
-    "rc-pagination": "~1.8.4",
+    "rc-pagination": "~1.8.7",
     "rc-progress": "~2.1.0",
     "rc-radio": "~2.0.0",
     "rc-rate": "~2.1.0",