diff --git a/README.md b/README.md
index bb4af46..739c9db 100644
--- a/README.md
+++ b/README.md
@@ -60,7 +60,7 @@ sudo docker run -v /Downloads:/data -p 6800:6800 -p 9100:8080 --name="webui-aria
 
 This image contains both aria2 and webui-aria2.
 
-Build it
+Build it (may take several hours due to the aria2 compilation process. Don't panic and grap a coffee)
 ```
 docker build -f rpi-Dockerfile -t yourname/webui-aria2 .
 ```
@@ -75,7 +75,7 @@ This image required few file to be mounted in the container's `/data` folder.
 
 Run it
 ```
-docker run -d -v /home/<USER>/data/aria2:/data -p 6800:6800 -p 9100:8080 --name="webui-aria2" yourname/webui-aria2
+docker run --restart=always -d -v /home/<USER>/data/aria2:/data -p 6800:6800 -p 9100:8080 --name="webui-aria2" yourname/webui-aria2
 ```
 
 Support
diff --git a/rpi-Dockerfile b/rpi-Dockerfile
index a6a9b87..a4d3f8c 100644
--- a/rpi-Dockerfile
+++ b/rpi-Dockerfile
@@ -5,7 +5,20 @@ RUN groupadd -r aria && useradd -r -g aria aria -u 1000
 
 # webui + aria2
 RUN apt-get update \
-        && apt-get install -y aria2 busybox curl git \
+        && apt-get install -y busybox curl \
+        git \
+        make g++ libssl-dev nettle-dev libgmp-dev libssh2-1-dev libc-ares-dev libxml2-dev zlib1g-dev libsqlite3-dev pkg-config libxml2-dev libcppunit-dev autoconf automake autotools-dev autopoint libtool \
+        && ARIA2_VERSION="1.30.0" \
+        && mkdir aria_build && cd aria_build \
+        && curl -L https://github.com/aria2/aria2/releases/download/release-"$ARIA2_VERSION"/aria2-"$ARIA2_VERSION".tar.gz > aria2.tar.gz \
+        && tar -xzf aria2.tar.gz \
+        && cd aria2-$ARIA2_VERSION \
+        && autoreconf -i  && ./configure && make \
+        && mv src/aria2c /usr/bin/ \
+        && cd ../.. \
+        && rm -rf aria_build \
+        && apt-get remove --purge --auto-remove make g++ libssl-dev nettle-dev libgmp-dev libssh2-1-dev libc-ares-dev libxml2-dev zlib1g-dev libsqlite3-dev pkg-config libxml2-dev libcppunit-dev autoconf automake autotools-dev autopoint libtool \
+        && apt-get install -y libxml2 libsqlite3-0 libc-ares2 zlib1g \
         && rm -rf /var/lib/apt/lists/*
 
 ADD . /webui-aria2