diff --git a/forks/hubzilla-docker/Dockerfile b/forks/hubzilla-docker/Dockerfile
index a2a6df7..dcfba4d 100644
--- a/forks/hubzilla-docker/Dockerfile
+++ b/forks/hubzilla-docker/Dockerfile
@@ -1,20 +1,13 @@
-
-FROM alpine:3.5
+FROM alpine:3.7
 MAINTAINER Silvio Fricke <silvio.fricke@gmail.com>
 
+ARG HUBZILLAVERSION=3.4
+ARG HUBZILLAADDONSVERSION=3.4
+ARG REFRESH=0
+
 ENTRYPOINT ["/start.sh"]
 VOLUME /data
 
-ADD addons/nginx-server.conf /etc/nginx/conf.d/default.conf
-ADD addons/start.sh /start.sh
-
-# useable for any git references
-ENV HUBZILLAVERSION 2.4
-
-ENV HUBZILLAINTERVAL 10
-env SERVERNAME 127.0.0.1
-
-
 RUN set -ex \
     && apk update \
     && apk upgrade \
@@ -26,19 +19,36 @@
         nginx \
         openssl \
         php5 \
+        php5-ctype \
         php5-curl \
+        php5-dom \
         php5-fpm \
         php5-gd \
         php5-json \
+        php5-mcrypt \
         php5-pdo_mysql \
         php5-pdo_pgsql \
         php5-openssl \
         php5-xml \
         php5-zip \
-    && mkdir -p /run/nginx /hubzilla \
+        php5-iconv \
+    && mkdir -p /run/nginx /hubzilla /hubzilla/addon \
     && curl https://codeload.github.com/redmatrix/hubzilla/tar.gz/${HUBZILLAVERSION} | tar -xz --strip-components=1 -C /hubzilla -f - \
+    && curl https://codeload.github.com/redmatrix/hubzilla-addons/tar.gz/${HUBZILLAADDONSVERSION} | tar -xz --strip-components=1 -C /hubzilla/addon -f - \
     && chown nginx:nginx -R /hubzilla \
     && chmod 0777 /hubzilla \
     && sed -i 's/;cgi.fix_pathinfo=1/cgi.fix_pathinfo=0/' /etc/php5/php.ini \
-    && chmod u+x /start.sh \
+    && sed -i 's/pm.max_children = 5/pm.max_children = 16/' /etc/php5/php-fpm.conf \
     && echo "*/###HUBZILLAINTERVAL###    *       *       *       *       cd /hubzilla; /usr/bin/php Zotlabs/Daemon/Master.php Cron" > /hubzilla-cron.txt
+
+WORKDIR /hubzilla
+COPY addons/longfeed.patch longfeed.patch
+RUN patch -p1 <longfeed.patch
+RUN rm longfeed.patch
+WORKDIR /
+
+COPY addons/nginx-server.conf /etc/nginx/conf.d/default.conf
+COPY addons/start.sh /start.sh
+
+ENV SERVERNAME=127.0.0.1
+ENV HUBZILLAINTERVAL=10