diff --git a/11-2.5-2.6/Dockerfile b/11-2.5-2.6/Dockerfile
new file mode 100755
index 0000000..e9a8cf7
--- /dev/null
+++ b/11-2.5-2.6/Dockerfile
@@ -0,0 +1,14 @@
+FROM mdillon/postgis:11
+MAINTAINER Hans Kristian Flaatten <hans@starefossen.com>
+
+ENV PGROUTING_MAJOR 2.6
+ENV PGROUTING_VERSION 2.6.1
+
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends \
+      wget \
+      postgresql-$PG_MAJOR-pgrouting && \
+    rm -rf /var/lib/apt/lists/*
+
+RUN mkdir -p /docker-entrypoint-initdb.d
+COPY ./initdb-pgrouting.sh /docker-entrypoint-initdb.d/routing.sh
diff --git a/11-2.5-2.6/initdb-pgrouting.sh b/11-2.5-2.6/initdb-pgrouting.sh
new file mode 100755
index 0000000..ecabf4f
--- /dev/null
+++ b/11-2.5-2.6/initdb-pgrouting.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+set -e
+
+# Perform all actions as user 'postgres'
+export PGUSER=postgres
+
+# Add pgRouting Functions to the database
+psql --dbname="$POSTGRES_DB" <<EOSQL
+CREATE EXTENSION postgis;
+CREATE EXTENSION pgrouting;
+EOSQL
diff --git a/README.md b/README.md
index 9386598..cdd3f60 100644
--- a/README.md
+++ b/README.md
@@ -13,12 +13,14 @@ The following Docker Image tags are supported.
 
 | Tag           | Postgres | PostGIS | pgRouting |
 |---------------|----------|---------|-----------|
-| [`latest` (Dockerfile)](https://github.com/Starefossen/docker-pgrouting/blob/master/10.1-2.4-2.5/Dockerfile)      | latest   | latest  | latest    |
+| [`latest` (Dockerfile)](https://github.com/Starefossen/docker-pgrouting/blob/master/11-2.5-2.6/Dockerfile)      | latest   | latest  | latest    |
 | [`9-2-2` (Dockerfile)](https://github.com/Starefossen/docker-pgrouting/blob/master/9.6-2.3-2.3/Dockerfile)       | 9.6      | 2.x     | 2.x       |
 | [`9.4-2.1-2.1` (Dockerfile)](https://github.com/Starefossen/docker-pgrouting/blob/master/9.4-2.1-2.1/Dockerfile) | 9.4.x    | 2.1.x   | 2.1.x     |
 | [`9.4-2.1-2.0` (Dockerfile)](https://github.com/Starefossen/docker-pgrouting/blob/master/9.4-2.1-2.0/Dockerfile) | 9.4.x    | 2.1.x   | 2.0.x     |
 | [`9.6-2.3-2.3` (Dockerfile)](https://github.com/Starefossen/docker-pgrouting/blob/master/9.6-2.3-2.3/Dockerfile) | 9.6.x    | 2.3.x   | 2.3.x     |
 | [`10.1-2.4-2.5` (Dockerfile)](https://github.com/Starefossen/docker-pgrouting/blob/master/10.1-2.4-2.5/Dockerfile) | 10.1.x    | 2.4.x   | 2.5.x     |
+| [`11-2.5-2.6` (Dockerfile)](https://github.com/Starefossen/docker-pgrouting/blob/master/11-2.5-2.6/Dockerfile) | 11   | 2.5.x   | 2.6.x     |
+
 
 ## What is pgRouting
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 63f8c2f..10fd117 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,3 +6,6 @@ pgrouting-9.6-2.3-2.3:
 
 pgrouting-10.1-2.4-2.5:
   build: 10.1-2.4-2.5/.
+
+pgrouting-11-2.5-2.6:
+  build: 11-2.5-2.6/.