diff --git a/README.md b/README.md
index 5a11375..25da0b2 100644
--- a/README.md
+++ b/README.md
@@ -68,6 +68,7 @@ A collection of delicious docker recipes.
 - [x] mosquitto
 - [x] motion-arm :+1:
 - [x] nginx
+- [x] nifi
 - [x] nullmailer
 - [x] nullmailer-arm
 - [x] openssh
diff --git a/nifi/Dockerfile b/nifi/Dockerfile
new file mode 100644
index 0000000..581b14a
--- /dev/null
+++ b/nifi/Dockerfile
@@ -0,0 +1,34 @@
+#
+# Dockerfile for nifi
+#
+
+FROM java:8-jre-alpine
+MAINTAINER kev <noreply@easypi.info>
+
+ENV NIFI_VERSION 0.6.1
+ENV NIFI_FILE nifi-${NIFI_VERSION}-bin.tar.gz
+ENV NIFI_URL https://archive.apache.org/dist/nifi/${NIFI_VERSION}/${NIFI_FILE}
+ENV NIFI_HOME /opt/nifi
+
+WORKDIR $NIFI_HOME
+
+RUN set -xe \
+    && apk add --no-cache bash curl tar \
+    && curl -sSL ${NIFI_URL} | tar xz --strip-components=1 \
+    && apk del curl tar \
+    && addgroup -g 1000 nifi \
+    && adduser -h ${NIFI_HOME} -s /bin/bash -G nifi -u 1000 -D -H nifi \
+    && mkdir -p content_repository database_repository flowfile_repository provenance_repository \
+    && chown -R nifi:nifi ${NIFI_HOME}
+
+VOLUME ${NIFI_HOME}/content_repository  \
+       ${NIFI_HOME}/database_repository \
+       ${NIFI_HOME}/flowfile_repository \
+       ${NIFI_HOME}/provenance_repository
+
+EXPOSE 8080 8081
+
+USER nifi
+
+ENTRYPOINT ["/opt/nifi/bin/nifi.sh"]
+CMD ["run"]
diff --git a/nifi/README.md b/nifi/README.md
new file mode 100644
index 0000000..b3f4449
--- /dev/null
+++ b/nifi/README.md
@@ -0,0 +1,10 @@
+nifi
+====
+
+[Apache nifi][1] is an easy to use, powerful, and reliable system to process
+and distribute data.
+
+![](https://nifi.apache.org/assets/images/flow-th.png)
+
+[1]: https://nifi.apache.org
+
diff --git a/nifi/docker-compose.yml b/nifi/docker-compose.yml
new file mode 100644
index 0000000..6350163
--- /dev/null
+++ b/nifi/docker-compose.yml
@@ -0,0 +1,11 @@
+nifi:
+  image: vimagick/nifi
+  ports:
+    - "8080:8080"
+    - "8081:8081"
+  volumes:
+    - ./data/content_repository:/opt/nifi/content_repository
+    - ./data/database_repository:/opt/nifi/database_repository
+    - ./data/flowfile_repository:/opt/nifi/flowfile_repository
+    - ./data/provenance_repository:/opt/nifi/provenance_repository
+  restart: always