diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..5e65d32
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "hydrus"]
+  path = hydrus
+  url = https://github.com/hydrusnetwork/hydrus
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 129349b..e7e0f95 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+### Changed
+
++ Updated hydrus server version
++ Included hydrus server as a Git submodule instead of downloading the sources
+  when building
+
 ## [2.2.0] - 2019-02-01
 
 ### Changed
diff --git a/Dockerfile b/Dockerfile
index 5c76fca..103d751 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,10 +16,9 @@ RUN \
 
 WORKDIR /usr/src/app
 
+COPY ./hydrus .
+
 RUN \
-  wget "https://github.com/hydrusnetwork/hydrus/archive/v338.tar.gz" && \
-  tar zxvf $(ls | grep ".tar.gz") --strip-components 1 && \
-  rm $(ls | grep ".tar.gz") && \
   chown -R hydrus:hydrus /usr/src/app && \
   chmod +x server.py && \
   chmod +x bin/swfrender_linux bin/upnpc_linux && \
@@ -36,7 +35,8 @@ RUN \
     libffi-dev \
     linux-headers \
     openssl \
-    openssl-dev && \
+    openssl-dev \
+    zlib-dev && \
   pip install virtualenv && \
   virtualenv venv && \
   source venv/bin/activate && \
@@ -54,7 +54,7 @@ RUN \
     service_identity~=18.1.0 \
     twisted~=18.9.0 && \
   rm -r ~/.cache && \
-  apk del build-base jpeg-dev libffi-dev linux-headers openssl-dev
+  apk del build-base jpeg-dev libffi-dev linux-headers openssl-dev zlib-dev
 
 COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint
 RUN chmod +x /usr/local/bin/docker-entrypoint
diff --git a/README.md b/README.md
index fe5d00e..0c848fa 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ This is a simple Alpine-based Docker setup for running
 easier to run hydrus server together with [hydrusrv][hydrusrv], but can of
 course also be used on its own.
 
-The latest build runs [hydrus server version 338][hydrus-server-version].
+The latest build runs [hydrus server version 339][hydrus-server-version].
 
 ## Table of contents
 
@@ -35,7 +35,7 @@ By default, this will pull the latest build. To specify an image with a
 specific version of hydrus server, provide the version number as tag, e.g.:
 
 ```zsh
-user@local:~$ docker pull mserajnik/hydrus-server-docker:338
+user@local:~$ docker pull mserajnik/hydrus-server-docker:339
 ```
 
 See [here][docker-hub-tags] for all the available version numbers/tags.
@@ -155,13 +155,13 @@ You are welcome to help out!
 
 [hydrus-server]: http://hydrusnetwork.github.io/hydrus/
 [hydrusrv]: https://github.com/mserajnik/hydrusrv
-[hydrus-server-version]: https://github.com/hydrusnetwork/hydrus/releases/tag/v338
+[hydrus-server-version]: https://github.com/hydrusnetwork/hydrus/releases/tag/v339
 [docker-hub]: https://hub.docker.com/r/mserajnik/hydrus-server-docker/
 [docker-hub-tags]: https://hub.docker.com/r/mserajnik/hydrus-server-docker/tags/
 [docker]: https://www.docker.com/
 [semantic-versioning]: https://semver.org/
 
-[hydrus-server-badge]: https://img.shields.io/badge/hydrus%20server-version%20338-blue.svg
+[hydrus-server-badge]: https://img.shields.io/badge/hydrus%20server-version%20339-blue.svg
 
 [travis]: https://travis-ci.com/mserajnik/hydrus-server-docker
 [travis-badge]: https://travis-ci.com/mserajnik/hydrus-server-docker.svg
diff --git a/hydrus b/hydrus
new file mode 160000
index 0000000..7619540
--- /dev/null
+++ b/hydrus
@@ -0,0 +1 @@
+Subproject commit 76195402624b3dfe4246480800c97105581981fe