diff --git a/ckan/Dockerfile b/ckan/Dockerfile
index 83e63099..e4d4118f 100644
--- a/ckan/Dockerfile
+++ b/ckan/Dockerfile
@@ -3,3 +3,15 @@ FROM ckan/ckan-base:2.10.1
 
 # Copy custom initialization scripts
 COPY docker-entrypoint.d/* /docker-entrypoint.d/
+
+# Apply any patches needed to CKAN core or any of the built extensions (not the
+# runtime mounted ones)
+COPY patches ${APP_DIR}/patches
+
+RUN for d in $APP_DIR/patches/*; do \
+        if [ -d $d ]; then \
+            for f in `ls $d/*.patch | sort -g`; do \
+                cd $SRC_DIR/`basename "$d"` && echo "$0: Applying patch $f to $SRC_DIR/`basename $d`"; patch -p1 < "$f" ; \
+            done ; \
+        fi ; \
+    done