diff --git a/Dockerfile b/Dockerfile
index 17db4fc..2ce683e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,14 @@
-FROM debian:jessie
-MAINTAINER Jan Broer <janeczku@yahoo.de>
-ENV DEBIAN_FRONTEND noninteractive
+FROM ubuntu:xenial
+MAINTAINER Jan Broer <janeczku@yahoo.de>, Michael C <admin@dragonfall.net>
+ARG DEBIAN_FRONTEND=noninteractive
 
 # Following 'How do I add or remove Dropbox from my Linux repository?' - https://www.dropbox.com/en/help/246
-RUN echo 'deb http://linux.dropbox.com/debian jessie main' > /etc/apt/sources.list.d/dropbox.list \
+RUN echo 'deb http://linux.dropbox.com/ubuntu xenial main' > /etc/apt/sources.list.d/dropbox.list \
+	#&& echo 'deb http://deb.debian.org/debian stretch main' > /etc/apt.sources.list \
 	&& apt-key adv --keyserver pgp.mit.edu --recv-keys 1C61A2656FB57B7E4DE0F4C1FC918B335044912E \
 	&& apt-get -qqy update \
 	# Note 'ca-certificates' dependency is required for 'dropbox start -i' to succeed
-	&& apt-get -qqy install ca-certificates curl python-gpgme dropbox \
+	&& apt-get -qqy install ca-certificates python-gpgme curl dropbox \
 	# Perform image clean up.
 	&& apt-get -qqy autoclean \
 	&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \
diff --git a/README.md b/README.md
index 1c12954..2f00c92 100644
--- a/README.md
+++ b/README.md
@@ -1,25 +1,24 @@
 # Dropbox in Docker
 
-[![Docker Pulls](https://img.shields.io/docker/pulls/janeczku/dropbox.svg?maxAge=2592000)][hub]
-[![License](https://img.shields.io/github/license/janeczku/docker-alpine-kubernetes.svg?maxAge=2592000)]()
+![Docker Pulls](https://img.shields.io/docker/pulls/smokex365/docker-dropbox-ext4.svg?maxAge=2592000)
 
-[hub]: https://hub.docker.com/r/janeczku/dropbox/
+[hub]: https://hub.docker.com/r/smokex365/docker-dropbox-ext4/
 
 Run Dropbox inside Docker. Fully working with local host folder mount or inter-container linking (via `--volumes-from`).
 
-This repository provides the [janeczku/dropbox](https://registry.hub.docker.com/u/janeczku/dropbox/) image.
+This repository is based on the [janeczku/dropbox](https://registry.hub.docker.com/u/janeczku/dropbox/) image and attempts to fix the file system error as a result of recent changes to the Dropbox client (no longer works on ext2 which the container uses).
 
 ## Usage examples
 
 ### Quickstart
 
-    docker run -d --restart=always --name=dropbox janeczku/dropbox
+    docker run -d --restart=always --name=dropbox smokex365/docker-dropbox-ext4
 
 ### Dropbox data mounted to local folder on the host
 
     docker run -d --restart=always --name=dropbox \
     -v /path/to/localfolder:/dbox/Dropbox \
-    janeczku/dropbox
+    smokex365/docker-dropbox-ext4
 
 ### Run dropbox with custom user/group id
 This fixes file permission errrors that might occur when mounting the Dropbox file folder (`/dbox/Dropbox`) from the host or a Docker container volume. You need to set `DBOX_UID`/`DBOX_GID` to the user id and group id of whoever owns these files on the host or in the other container.
@@ -27,13 +26,13 @@ This fixes file permission errrors that might occur when mounting the Dropbox fi
     docker run -d --restart=always --name=dropbox \
     -e DBOX_UID=110 \
     -e DBOX_GID=200 \
-    janeczku/dropbox
+    smokex365/docker-dropbox-ext4
 
 ### Enable LAN Sync
 
     docker run -d --restart=always --name=dropbox \
     --net="host" \
-    janeczku/dropbox
+    smokex365/docker-dropbox-ext4
 
 ## Linking to Dropbox account after first start