diff --git a/Dockerfile b/Dockerfile
index 19e3fd2ef6b..174120ae1a9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,6 +16,7 @@ RUN curl -sL https://deb.nodesource.com/setup_6.x | bash -\
        unzip \
        fontforge \
        python-lxml \
+       libicu-dev \
   && npm install -g gulp \
   && rm -rf /var/lib/apt/lists/*\
   && mkdir -p /home/docker/.gem/ruby/$RUBY_MAJOR.0
diff --git a/docker-compose.yml b/docker-compose.yml
index 3f3d6b18dde..2b6c25d94fb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,7 +13,7 @@ services:
     command: bundle exec script/delayed_job run
 
   postgres:
-    image: postgres:9.3
+    build: ./docker-compose/postgres
 
   redis:
     image: redis:2.6
diff --git a/docker-compose/postgres/Dockerfile b/docker-compose/postgres/Dockerfile
new file mode 100644
index 00000000000..007c9457bca
--- /dev/null
+++ b/docker-compose/postgres/Dockerfile
@@ -0,0 +1,12 @@
+FROM postgres:9.3
+
+# Install dependencies for postgres extension for I18n sorting
+RUN apt-get update -qq \
+  && apt-get install -qqy \
+      build-essential \
+      libicu-dev \
+      postgresql-server-dev-all \
+      pgxnclient \
+  && rm -rf /var/lib/apt/lists/*
+# Install postgres extension for I8n sorting
+RUN pgxnclient install pg_collkey