diff --git a/hapi-fhir-jpaserver-example/Dockerfile b/hapi-fhir-jpaserver-example/Dockerfile
new file mode 100644
index 00000000000..1c26aefb5ad
--- /dev/null
+++ b/hapi-fhir-jpaserver-example/Dockerfile
@@ -0,0 +1,4 @@
+FROM jetty:9-jre8-alpine
+USER jetty:jetty
+ADD ./target/hapi-fhir-jpaserver-example.war /var/lib/jetty/webapps/root.war
+EXPOSE 8080
diff --git a/hapi-fhir-jpaserver-example/README.md b/hapi-fhir-jpaserver-example/README.md
new file mode 100644
index 00000000000..a6d538db2ae
--- /dev/null
+++ b/hapi-fhir-jpaserver-example/README.md
@@ -0,0 +1,43 @@
+## Running hapi-fhir-jpaserver-example in Tomcat from IntelliJ
+
+Install Tomcat.
+
+Make sure you have Tomcat set up in IntelliJ.
+
+- File->Settings->Build, Execution, Deployment->Application Servers
+- Click +
+- Select "Tomcat Server"
+- Enter the path to your tomcat deployment for both Tomcat Home (IntelliJ will fill in base directory for you)
+
+Add a Run Configuration for running hapi-fhir-jpaserver-example under Tomcat
+
+- Run->Edit Configurations
+- Click the green +
+- Select Tomcat Server, Local
+- Change the name to whatever you wish
+- Uncheck the "After launch" checkbox
+- On the "Deployment" tab, click the green +
+- Select "Artifact"
+- Select "hapi-fhir-jpaserver-example:war" 
+- In "Application context" type /hapi
+
+Run the configuration.
+
+- You should now have an "Application Servers" in the list of windows at the bottom.
+- Click it.
+- Select your server, and click the green triangle (or the bug if you want to debug)
+- Wait for the console output to stop
+
+Point your browser (or fiddler, or what have you) to `http://localhost:8080/hapi/base/Patient`
+
+You should get an empty bundle back.
+
+
+## Running hapi-fhir-jpaserver-example in a Docker container
+
+Execute the `build-docker-image.sh` script to build the docker image. 
+
+Use this command to start the container: 
+  `docker run -d --name hapi-fhir-jpaserver-example -p 8080:8080 hapi-fhir/hapi-fhir-jpaserver-example`
+
+Note: with this command data is persisted across container restarts, but not after removal of the container. Use a docker volume mapping on /var/lib/jetty/target to achieve this.
diff --git a/hapi-fhir-jpaserver-example/build-docker-image.sh b/hapi-fhir-jpaserver-example/build-docker-image.sh
new file mode 100755
index 00000000000..6d1cfc3ca10
--- /dev/null
+++ b/hapi-fhir-jpaserver-example/build-docker-image.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+mvn package && \
+  docker build -t hapi-fhir/hapi-fhir-jpaserver-example .
+
diff --git a/hapi-fhir-jpaserver-example/readme.intellij.txt b/hapi-fhir-jpaserver-example/readme.intellij.txt
deleted file mode 100644
index 049d5d341a5..00000000000
--- a/hapi-fhir-jpaserver-example/readme.intellij.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-Running hapi-fhir-jpaserver-example in Tomcat from IntelliJ
-
-Install Tomcat.
-
-Make sure you have Tomcat set up in IntelliJ.
-File->Settings->Build, Execution, Deployment->Application Servers
-Click +
-Select "Tomcat Server"
-Enter the path to your tomcat deployment for both Tomcat Home (IntelliJ will fill in base directory for you)
-
-Add a Run Configuration for running hapi-fhir-jpaserver-example under Tomcat
-Run->Edit Configurations
-Click the green +
-Select Tomcat Server, Local
-Change the name to whatever you wish
-Uncheck the "After launch" checkbox
-On the "Deployment" tab, click the green +
-Select "Artifact"
-Select "hapi-fhir-jpaserver-example:war"
-In "Application context" type /hapi
-
-Run the configuration
-You should now have an "Application Servers" in the list of windows at the bottom.
-Click it.
-Select your server, and click the green triangle (or the bug if you want to debug)
-Wait for the console output to stop
-
-Point your browser (or fiddler, or what have you) to 
-http://localhost:8080/hapi/base/Patient
-
-You should get an empty bundle back.
\ No newline at end of file