diff --git a/.bzrignore b/.bzrignore
index 7c5597bce..0cbb3f17f 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -131,5 +131,6 @@ grub-core/gnulib/unistd.h
 grub-core/gnulib/warn-on-use.h
 grub-core/gnulib/wchar.h
 grub-core/gnulib/wctype.h
+grub-core/rs_decoder.S
 widthspec.bin
 widthspec.h
diff --git a/ChangeLog b/ChangeLog
index e8ac26e83..abd1d0400 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-12-10  Colin Watson  <cjwatson@ubuntu.com>
+
+	* .bzrignore: Ignore grub-core/rs_decoder.S.
+
 2010-12-10  Colin Watson  <cjwatson@ubuntu.com>
 
 	* grub-core/gettext/gettext.c (grub_gettext_init_ext): Factor out