diff --git a/README.md b/README.md
index ef2f72b..408cf73 100644
--- a/README.md
+++ b/README.md
@@ -11,4 +11,6 @@ For RapidPro v3 builds use: `rapidpro/rapidpro-base:v3`
 
 For RapidPro v4 builds use: `rapidpro/rapidpro-base:v4`
 
+For RapidPro v6 builds use: `rapidpro/rapidpro-base:v6`
+
 `rapidpro-base:latest` still points at v3 for backwards compatibility but consider it deprecated.
diff --git a/v6/Dockerfile b/v6/Dockerfile
new file mode 100644
index 0000000..0ba1ce8
--- /dev/null
+++ b/v6/Dockerfile
@@ -0,0 +1,15 @@
+FROM python:3.9-alpine
+
+COPY stack/geolibs.sh /
+RUN set -ex \
+        && apk add --no-cache --virtual .build-deps \
+                gcc \
+                g++ \
+                make \
+                libc-dev \
+                musl-dev \
+                linux-headers \
+        && sh /geolibs.sh \
+        && apk del .build-deps
+
+CMD ["python3"]
diff --git a/v6/README.md b/v6/README.md
new file mode 100644
index 0000000..db261f8
--- /dev/null
+++ b/v6/README.md
@@ -0,0 +1,2 @@
+This builds the image for RapidPro v6.
+The images are built by hub.docker.com.
diff --git a/v6/stack/geolibs.sh b/v6/stack/geolibs.sh
new file mode 100644
index 0000000..738fb40
--- /dev/null
+++ b/v6/stack/geolibs.sh
@@ -0,0 +1,53 @@
+#!/bin/sh
+
+set -e # fail on any error
+
+
+# Versions
+# ===================================================================
+GEOS_VERSION=3.4.3
+PROJ_VERSION=4.9.3
+PROJ_DATUMGRID_VERSION=1.5
+GDAL_VERSION=1.11.5
+
+
+# Install geos
+# ===================================================================
+cd /tmp
+wget http://download.osgeo.org/geos/geos-${GEOS_VERSION}.tar.bz2
+tar xjf geos-${GEOS_VERSION}.tar.bz2
+cd geos-${GEOS_VERSION}
+./configure --enable-silent-rules CFLAGS="-D__sun -D__GNUC__"  CXXFLAGS="-D__GNUC___ -D__sun"
+make -s
+make -s install
+
+
+# Install proj
+# ===================================================================
+cd /tmp
+wget http://download.osgeo.org/proj/proj-${PROJ_VERSION}.tar.gz
+wget http://download.osgeo.org/proj/proj-datumgrid-${PROJ_DATUMGRID_VERSION}.tar.gz
+tar xzf proj-${PROJ_VERSION}.tar.gz
+cd proj-${PROJ_VERSION}/nad
+tar xzf ../../proj-datumgrid-${PROJ_DATUMGRID_VERSION}.tar.gz
+cd ..
+./configure --enable-silent-rules
+make -s
+make -s install
+
+
+# Install gdal
+# ===================================================================
+cd /tmp
+wget http://download.osgeo.org/gdal/${GDAL_VERSION}/gdal-${GDAL_VERSION}.tar.gz
+tar xzf gdal-${GDAL_VERSION}.tar.gz
+cd gdal-${GDAL_VERSION}
+./configure --enable-silent-rules --with-static-proj4=/usr/local/lib
+make -s
+make -s install
+
+
+# Clean up
+# ===================================================================
+rm -rf /tmp/*
+rm -rf /root/.cache