diff --git a/components/calendar/locale/fi_FI.tsx b/components/calendar/locale/fi_FI.tsx
new file mode 100644
index 0000000000..b81ea86283
--- /dev/null
+++ b/components/calendar/locale/fi_FI.tsx
@@ -0,0 +1,2 @@
+import fi_FI from '../../date-picker/locale/fi_FI';
+export default fi_FI;
diff --git a/components/date-picker/locale/fi_FI.tsx b/components/date-picker/locale/fi_FI.tsx
new file mode 100644
index 0000000000..69a0b18f31
--- /dev/null
+++ b/components/date-picker/locale/fi_FI.tsx
@@ -0,0 +1,17 @@
+import CalendarLocale from 'rc-calendar/lib/locale/fi_FI';
+import TimePickerLocale from '../../time-picker/locale/fi_FI';
+import assign from 'object-assign';
+
+// Merge into a locale object
+const locale = {
+  lang: assign({
+    placeholder: 'Valitse päivä',
+    rangePlaceholder: ['Alku päivä', 'Loppu päivä'],
+  }, 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/fi_FI.tsx b/components/locale-provider/fi_FI.tsx
new file mode 100644
index 0000000000..0352568db2
--- /dev/null
+++ b/components/locale-provider/fi_FI.tsx
@@ -0,0 +1,47 @@
+import moment from 'moment';
+moment.locale('fi');
+
+import Pagination from 'rc-pagination/lib/locale/fi_FI';
+import DatePicker from '../date-picker/locale/fi_FI';
+import TimePicker from '../time-picker/locale/fi_FI';
+import Calendar from '../calendar/locale/fi_FI';
+
+export default {
+  locale: 'fi',
+  Pagination,
+  DatePicker,
+  TimePicker,
+  Calendar,
+  Table: {
+    filterTitle: 'Suodatus valikko',
+    filterConfirm: 'OK',
+    filterReset: 'Tyhjennä',
+    emptyText: 'Ei kohteita',
+    selectAll: 'Valitse kaikki',
+    selectInvert: 'Valitse päinvastoin',
+  },
+  Modal: {
+    okText: 'OK',
+    cancelText: 'Peruuta',
+    justOkText: 'OK',
+  },
+  Popconfirm: {
+    okText: 'OK',
+    cancelText: 'Peruuta',
+  },
+  Transfer: {
+    notFoundContent: 'Ei löytynyt',
+    searchPlaceholder: 'Etsi täältä',
+    itemUnit: 'kohde',
+    itemsUnit: 'kohdetta',
+  },
+  Select: {
+    notFoundContent: 'Ei löytynyt',
+  },
+  Upload: {
+    uploading: 'Lähetetään...',
+    removeFile: 'Poista tiedosto',
+    uploadError: 'Virhe lähetyksessä',
+    previewFile: 'Esikatsele tiedostoa',
+  },
+};
diff --git a/components/time-picker/locale/fi_FI.tsx b/components/time-picker/locale/fi_FI.tsx
new file mode 100644
index 0000000000..6c4d9a1228
--- /dev/null
+++ b/components/time-picker/locale/fi_FI.tsx
@@ -0,0 +1,5 @@
+const locale = {
+  placeholder: 'Valitse aika',
+};
+
+export default locale;
diff --git a/package.json b/package.json
index f55547aa57..d14f6601be 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
     "object-assign": "~4.1.0",
     "omit.js": "^0.1.0",
     "rc-animate": "~2.3.0",
-    "rc-calendar": "~7.8.0",
+    "rc-calendar": "~8.1.0",
     "rc-cascader": "~0.11.0",
     "rc-checkbox": "~1.5.0",
     "rc-collapse": "~1.6.4",
@@ -54,7 +54,7 @@
     "rc-input-number": "~3.4.4",
     "rc-menu": "~5.0.9",
     "rc-notification": "~1.4.0",
-    "rc-pagination": "~1.8.0",
+    "rc-pagination": "~1.8.4",
     "rc-progress": "~2.1.0",
     "rc-radio": "~2.0.0",
     "rc-rate": "~2.1.0",