diff --git a/Dockerfile b/Dockerfile
index 95ec876..d5016df 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 # Build environment for CyanogenMod
 
-FROM ubuntu:14.04
+FROM ubuntu:16.04
 MAINTAINER Michael Stucki <mundaun@gmx.ch>
 
 ENV DEBIAN_FRONTEND noninteractive
@@ -9,12 +9,14 @@ RUN sed -i 's/main$/main universe/' /etc/apt/sources.list
 RUN apt-get -qq update
 RUN apt-get -qqy upgrade
 
-# Install build dependencies (source: https://wiki.cyanogenmod.org/w/Build_for_angler)
-RUN apt-get install -y bison build-essential curl flex git gnupg gperf libesd0-dev liblz4-tool libncurses5-dev libsdl1.2-dev libwxgtk2.8-dev libxml2 libxml2-utils lzop maven openjdk-7-jdk openjdk-7-jre pngcrush schedtool squashfs-tools xsltproc zip zlib1g-dev
-RUN apt-get install -y g++-multilib gcc-multilib lib32ncurses5-dev lib32readline-gplv2-dev lib32z1-dev
+# Install build dependencies (source: https://wiki.cyanogenmod.org/w/Build_for_bullhead)
+RUN apt-get install -y bison build-essential curl flex git gnupg gperf libesd0-dev liblz4-tool libncurses5-dev libsdl1.2-dev libwxgtk3.0-dev libxml2 libxml2-utils lzop maven openjdk-8-jdk pngcrush schedtool squashfs-tools xsltproc zip zlib1g-dev
+
+# for 64-bit systems
+RUN apt-get install -y g++-multilib gcc-multilib lib32ncurses5-dev lib32readline6-dev lib32z1-dev
 
 # Install additional packages which are useful for building Android
-RUN apt-get install -y ccache rsync tig
+RUN apt-get install -y ccache rsync tig sudo
 RUN apt-get install -y android-tools-adb android-tools-fastboot
 RUN apt-get install -y bc bsdmainutils file screen
 RUN apt-get install -y bash-completion wget nano
diff --git a/run.sh b/run.sh
index 1b6505c..d9abff4 100755
--- a/run.sh
+++ b/run.sh
@@ -39,7 +39,7 @@ if [ $? -ne 0 ]; then
 elif [[ $FORCE_BUILD = 1 ]] || ! echo "$IMAGE_EXISTS" | grep -q "$TAG"; then
 	# Pull Ubuntu image to be sure it's up to date
 	echo "Fetching Docker \"ubuntu\" image..."
-	docker pull ubuntu:14.04
+	docker pull ubuntu:16.04
 
 	echo "Building Docker image $REPOSITORY:$TAG..."
 	docker build -t $REPOSITORY:$TAG .