diff --git a/gdb/gdbserver/.gitignore b/gdb/gdbserver/.gitignore
index 9c9495023d..bb5c2937c4 100644
--- a/gdb/gdbserver/.gitignore
+++ b/gdb/gdbserver/.gitignore
@@ -1,4 +1,12 @@
 gdbreplay
 gdbserver
+libinproctrace.so
+
+amd64-avx-linux.c
+amd64-linux.c
+i386-avx-linux.c
+i386-linux.c
+i386-mmx-linux.c
 reg-*.c
 version.c
+xml-builtin.c
diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 91b12e0750..238679e725 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,7 @@
+2012-03-21  Mike Frysinger  <vapier@gentoo.org>
+
+	* .gitignore: Ignore more files.
+
 2012-03-19  Pedro Alves  <palves@redhat.com>
 	    Jan Kratochvil  <jan.kratochvil@redhat.com>