diff --git a/README.md b/README.md
index 4927c0d..6ea0f1c 100644
--- a/README.md
+++ b/README.md
@@ -37,6 +37,7 @@ dockerfiles
     - [x] dnscrypt-proxy
     - [x] dnscrypt-wrapper
 - [x] dokuwiki :+1:
+- [x] dokuwiki-arm :+1:
 - [x] ferm
 - [x] ffserver :beetle:
 - [x] fteproxy :+1:
diff --git a/dokuwiki/arm/Dockerfile b/dokuwiki/arm/Dockerfile
new file mode 100644
index 0000000..71e54a4
--- /dev/null
+++ b/dokuwiki/arm/Dockerfile
@@ -0,0 +1,38 @@
+#
+# Dockerfile for dokuwiki-arm
+#
+
+FROM easypi/alpine-arm
+MAINTAINER EasyPi Software Foundation
+
+WORKDIR /var/www/html
+
+RUN set -xe \
+    && apk add -U ca-certificates \
+                  gzip \
+                  nginx \
+                  php-fpm \
+                  php-openssl \
+                  php-pdo_sqlite \
+                  php-sqlite3 \
+                  php-xml \
+                  php-zlib \
+                  tar \
+    && wget -O- http://download.dokuwiki.org/src/dokuwiki/dokuwiki-stable.tgz | tar xz --strip 1 \
+    && chown -R nobody:nobody . \
+    && rm -rf /var/cache/apk/*
+
+COPY nginx.conf /etc/nginx/nginx.conf
+
+VOLUME /var/www/html/conf \
+       /var/www/html/data/pages \
+       /var/www/html/data/meta \
+       /var/www/html/data/media \
+       /var/www/html/data/media_attic \
+       /var/www/html/data/media_meta \
+       /var/www/html/data/attic \
+       /var/www/html/lib/plugins
+
+EXPOSE 80
+
+CMD php-fpm && nginx -g 'daemon off;'
diff --git a/dokuwiki/arm/docker-compose.yml b/dokuwiki/arm/docker-compose.yml
new file mode 100644
index 0000000..b0d8c79
--- /dev/null
+++ b/dokuwiki/arm/docker-compose.yml
@@ -0,0 +1,5 @@
+dokuwiki:
+  image: easypi/dokuwiki-arm
+  ports:
+      - "8000:80"
+  restart: always
diff --git a/dokuwiki/arm/nginx.conf b/dokuwiki/arm/nginx.conf
new file mode 100644
index 0000000..47ec5f2
--- /dev/null
+++ b/dokuwiki/arm/nginx.conf
@@ -0,0 +1,49 @@
+worker_processes  4;
+
+events {
+    worker_connections  1024;
+}
+
+http {
+    include       mime.types;
+    default_type  application/octet-stream;
+    sendfile        on;
+    keepalive_timeout  65;
+
+    server {
+        listen       80;
+        server_name  _;
+
+        client_max_body_size 4M;
+        client_body_buffer_size 128k;
+     
+        root /var/www/html;
+        index doku.php;
+     
+        location ~ /(data/|conf/|bin/|inc/) { deny all; }
+     
+        location ~* \.(js|css|png|jpg|jpeg|gif|ico)$ {
+            expires 31536000s;
+            add_header Pragma "public";
+            add_header Cache-Control "max-age=31536000, public, must-revalidate, proxy-revalidate";
+            log_not_found off;
+        }
+     
+        location / { try_files $uri $uri/ @dokuwiki; }
+     
+        location @dokuwiki {
+            rewrite ^/_media/(.*) /lib/exe/fetch.php?media=$1 last;
+            rewrite ^/_detail/(.*) /lib/exe/detail.php?media=$1 last;
+            rewrite ^/_export/([^/]+)/(.*) /doku.php?do=export_$1&id=$2 last;
+            rewrite ^/(.*) /doku.php?id=$1&$args last;
+        }
+     
+        location ~ \.php$ {
+            try_files $uri $uri/ /doku.php;
+            include fastcgi_params;
+            fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+            fastcgi_param REDIRECT_STATUS 200;
+            fastcgi_pass 127.0.0.1:9000;
+        }
+    }
+}
diff --git a/tinc/README.md b/tinc/README.md
index 5f04e25..5f9f7da 100644
--- a/tinc/README.md
+++ b/tinc/README.md
@@ -3,7 +3,7 @@ tinc
 
 ![](https://badge.imagelayers.io/vimagick/tinc:latest.svg)
 
-[`tinc`][1] is a Virtual Private Network (VPN) daemon that uses tunnelling and
+[tinc][1] is a Virtual Private Network (VPN) daemon that uses tunnelling and
 encryption to create a secure private network between hosts on the Internet.
 
 To use this image, you need to: