diff --git a/dev-support/docker/Dockerfile b/dev-support/docker/Dockerfile
index 81296dc46db..f761f8b4404 100644
--- a/dev-support/docker/Dockerfile
+++ b/dev-support/docker/Dockerfile
@@ -19,10 +19,20 @@
 # See BUILDING.txt.
 
 # FROM dockerfile/java:openjdk-7-jdk
-FROM dockerfile/java:oracle-java7
+# FROM dockerfile/java:oracle-java7
+FROM ubuntu:trusty
 
 WORKDIR /root
 
+RUN apt-get install -y software-properties-common
+RUN add-apt-repository -y ppa:webupd8team/java
+RUN apt-get update
+
+# Auto-accept the Oracle JDK license
+RUN echo oracle-java7-installer shared/accepted-oracle-license-v1-1 select true | sudo /usr/bin/debconf-set-selections
+
+RUN apt-get install -y oracle-java7-installer
+
 # Install dependencies from packages
 RUN apt-get update && apt-get install --no-install-recommends -y \
     git curl ant make maven \
diff --git a/dev-support/docker/hadoop_env_checks.sh b/dev-support/docker/hadoop_env_checks.sh
old mode 100644
new mode 100755
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 8e90a99af13..ddcd0ba3dce 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -621,6 +621,8 @@ Release 2.8.0 - UNRELEASED
     HADOOP-10387. Misspelling of threshold in log4j.properties for tests in
     hadoop-common-project. (Brahma Reddy Battula via aajisaka)
 
+    HADOOP-11936. Dockerfile references a removed image (aw)
+
 Release 2.7.1 - UNRELEASED
 
   INCOMPATIBLE CHANGES
diff --git a/start-build-env.sh b/start-build-env.sh
old mode 100644
new mode 100755