diff --git a/hadoop-common/CHANGES.txt b/hadoop-common/CHANGES.txt
index ad275858c1..d5d41735a8 100644
--- a/hadoop-common/CHANGES.txt
+++ b/hadoop-common/CHANGES.txt
@@ -317,6 +317,8 @@ Trunk (unreleased changes)
     HADOOP-7499. Add method for doing a sanity check on hostnames in NetUtils.
     (Jeffrey Naisbit via mahadev)
 
+    HADOOP-6158. Move CyclicIteration to HDFS. (eli)
+
   OPTIMIZATIONS
   
     HADOOP-7333. Performance improvement in PureJavaCrc32. (Eric Caspole
diff --git a/hadoop-common/src/main/java/org/apache/hadoop/util/CyclicIteration.java b/hdfs/src/java/org/apache/hadoop/hdfs/util/CyclicIteration.java
similarity index 98%
rename from hadoop-common/src/main/java/org/apache/hadoop/util/CyclicIteration.java
rename to hdfs/src/java/org/apache/hadoop/hdfs/util/CyclicIteration.java
index a3b27b4e16..78c385eab2 100644
--- a/hadoop-common/src/main/java/org/apache/hadoop/util/CyclicIteration.java
+++ b/hdfs/src/java/org/apache/hadoop/hdfs/util/CyclicIteration.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.hadoop.util;
+package org.apache.hadoop.hdfs.util;
 
 import java.util.Iterator;
 import java.util.Map;
@@ -110,4 +110,4 @@ public class CyclicIteration<K, V> implements Iterable<Map.Entry<K, V>> {
       throw new UnsupportedOperationException("Not supported");
     }
   }
-}
\ No newline at end of file
+}
diff --git a/hadoop-common/src/test/java/org/apache/hadoop/util/TestCyclicIteration.java b/hdfs/src/test/hdfs/org/apache/hadoop/hdfs/util/TestCyclicIteration.java
similarity index 98%
rename from hadoop-common/src/test/java/org/apache/hadoop/util/TestCyclicIteration.java
rename to hdfs/src/test/hdfs/org/apache/hadoop/hdfs/util/TestCyclicIteration.java
index 7dfa4763e1..60451eb1ff 100644
--- a/hadoop-common/src/test/java/org/apache/hadoop/util/TestCyclicIteration.java
+++ b/hdfs/src/test/hdfs/org/apache/hadoop/hdfs/util/TestCyclicIteration.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.hadoop.util;
+package org.apache.hadoop.hdfs.util;
 
 import java.util.ArrayList;
 import java.util.Arrays;