diff --git a/.gitignore b/.gitignore
index 93e755ce9ce..7ccf460b5b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,8 @@
 *.iml
 *.ipr
 *.iws
+*.orig
+*.rej
 .idea
 .svn
 .classpath
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 9f33668598f..939dfed1f0d 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -53,6 +53,8 @@ Release 2.5.0 - UNRELEASED
 
     HADOOP-10588. Workaround for jetty6 acceptor startup issue. (kihwal)
 
+    HADOOP-10609. .gitignore should ignore .orig and .rej files. (kasha)
+
   OPTIMIZATIONS
 
   BUG FIXES