diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 467be0ee92b..ab39df31aee 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -718,6 +718,9 @@ Release 2.7.0 - UNRELEASED
     
     HADOOP-11757. NFS gateway should shutdown when it can't start UDP or TCP
     server (brandonli)
+
+    HADOOP-11377. Added Null.java without which jdiff completely flops. (Tsuyoshi
+    Ozawa via vinodkv)
     
 Release 2.6.1 - UNRELEASED
 
diff --git a/hadoop-common-project/hadoop-common/dev-support/jdiff/Null.java b/hadoop-common-project/hadoop-common/dev-support/jdiff/Null.java
new file mode 100644
index 00000000000..7b00145ced7
--- /dev/null
+++ b/hadoop-common-project/hadoop-common/dev-support/jdiff/Null.java
@@ -0,0 +1,20 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+public class Null {
+  public Null() { }
+}
diff --git a/hadoop-hdfs-project/hadoop-hdfs/dev-support/jdiff/Null.java b/hadoop-hdfs-project/hadoop-hdfs/dev-support/jdiff/Null.java
new file mode 100644
index 00000000000..7b00145ced7
--- /dev/null
+++ b/hadoop-hdfs-project/hadoop-hdfs/dev-support/jdiff/Null.java
@@ -0,0 +1,20 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+public class Null {
+  public Null() { }
+}