diff --git a/.gitignore b/.gitignore
index b4355b9faf..75891c393b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -128,8 +128,7 @@ common-cmds.h
 *.deb
 git-core.spec
 *.exe
-libgit.a
-*.o
+*.[ao]
 *.py[co]
 config.mak
 git-blame
diff --git a/Makefile b/Makefile
index f5e2fc8ceb..02d290d334 100644
--- a/Makefile
+++ b/Makefile
@@ -629,7 +629,8 @@ rpm: dist
 ### Cleaning rules
 
 clean:
-	rm -f *.o mozilla-sha1/*.o arm/*.o ppc/*.o compat/*.o $(LIB_FILE)
+	rm -f *.o mozilla-sha1/*.o arm/*.o ppc/*.o compat/*.o xdiff/*.o \
+		$(LIB_FILE) $(XDIFF_LIB)
 	rm -f $(ALL_PROGRAMS) git$X
 	rm -f *.spec *.pyc *.pyo */*.pyc */*.pyo common-cmds.h TAGS tags
 	rm -rf $(GIT_TARNAME)