diff --git a/Dockerfile b/Dockerfile
index 3c5d186..0c37a5e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,24 +1,23 @@
 FROM debian:jessie
 MAINTAINER Lin Song <linsongui@gmail.com>
 
-ENV REFRESHED_AT 2016-05-25
-
+ENV REFRESHED_AT 2016-06-21
 ENV SWAN_VER 3.17
-ENV DEBIAN_FRONTEND noninteractive
 
 RUN apt-get -yqq update \
-    && apt-get -yqq --no-install-recommends install \
+    && DEBIAN_FRONTEND=noninteractive apt-get -yqq --no-install-recommends install \
          wget dnsutils openssl ca-certificates kmod \
          iproute gawk grep sed net-tools iptables \
          libnss3-dev libnspr4-dev pkg-config libpam0g-dev \
          libcap-ng-dev libcap-ng-utils libselinux1-dev \
          libcurl4-nss-dev flex bison gcc make \
          libunbound-dev libnss3-tools libevent-dev xl2tpd xmlto \
-    && apt-get clean \
+    && apt-get -y clean \
     && rm -rf /var/lib/apt/lists/*
 
 WORKDIR /opt/src
 RUN wget -t 3 -T 30 -nv -O "libreswan-${SWAN_VER}.tar.gz" "https://download.libreswan.org/libreswan-${SWAN_VER}.tar.gz" \
+    || wget -t 3 -T 30 -nv -O "libreswan-${SWAN_VER}.tar.gz" "https://github.com/libreswan/libreswan/archive/v${SWAN_VER}.tar.gz" \
     && tar xzf "libreswan-${SWAN_VER}.tar.gz" \
     && rm -f "libreswan-${SWAN_VER}.tar.gz" \
     && cd "libreswan-${SWAN_VER}" \