diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 7323e3f82e2..c7c2633763a 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -363,6 +363,9 @@ Release 2.1.1-beta - UNRELEASED
HADOOP-9757. Har metadata cache can grow without limit (Cristina Abad via daryn)
+ HADOOP-9857. Tests block and sometimes timeout on Windows due to invalid
+ entropy source. (cnauroth)
+
Release 2.1.0-beta - 2013-08-06
INCOMPATIBLE CHANGES
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index 7660ee8fb1b..4b4ba629df6 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -57,6 +57,7 @@
${basedir}/../../hadoop-common-project/hadoop-common/target
+ file:///dev/urandom
@@ -831,7 +832,7 @@
true
${basedir}/src/test/resources/krb5.conf
- file:///dev/urandom
+ ${java.security.egd}
${require.test.libhadoop}
@@ -885,6 +886,13 @@
Windows
+
+
+
+
+
+ file:/dev/urandom
+