diff --git a/Dockerfile b/Dockerfile
index 93bd712..d6af795 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,21 +1,22 @@
-FROM alpine:3.3
+FROM alpine:3.5
 
 # the following ENV need to be present
 ENV IAM_ROLE=none
 ENV MOUNT_POINT=/var/s3
 VOLUME /var/s3
 
-ARG S3FS_VERSION=v1.79
+ARG S3FS_VERSION=v1.80
 
-RUN apk --update add fuse alpine-sdk automake autoconf libxml2-dev fuse-dev curl-dev git bash;
-RUN git clone https://github.com/s3fs-fuse/s3fs-fuse.git; \
- cd s3fs-fuse; \
- git checkout tags/${S3FS_VERSION}; \
- ./autogen.sh; \
- ./configure --prefix=/usr; \
- make; \
- make install; \
- rm -rf /var/cache/apk/*;
+RUN apk --update add bash fuse libcurl libxml2 libstdc++ libgcc alpine-sdk automake autoconf libxml2-dev fuse-dev curl-dev git; \
+git clone https://github.com/s3fs-fuse/s3fs-fuse.git; \
+cd s3fs-fuse; \
+git checkout tags/${S3FS_VERSION}; \
+./autogen.sh; \
+./configure --prefix=/usr; \
+make; \
+make install; \
+apk del alpine-sdk automake autoconf libxml2-dev fuse-dev curl-dev git; \
+rm -rf /var/cache/apk/*;
 
 COPY docker-entrypoint.sh /
 ENTRYPOINT ["/docker-entrypoint.sh"]
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 1bcb04e..ddac88d 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -6,8 +6,6 @@ IFS=$'\n\t'
 
 export S3_ACL=${S3_ACL:-private}
 
-test $MOUNT_POINT
-rm -rf ${MOUNT_POINT}
 mkdir -p ${MOUNT_POINT}
 
 if [ "$IAM_ROLE" == "none" ]; then