diff --git a/.gitignore b/.gitignore
index 144ebb3b..82620f3c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,80 +1,97 @@
 *.o
 *.static.o
 *.o.d
-tags
-.cc-defines.h
-version.h
-version
-man/*.gz
-Documentation/*.gz
-Documentation/*.html
-btrfs
-btrfs.static
-btrfs-map-logical
-btrfs-fragments
-btrfsck
-ioctl-test
-dir-test
-send-test
-quick-test
-find-root
-mkfs.btrfs
-mkfs.btrfs.static
-repair
-restore
-btrfs-convert
-btrfs-find-root
-btrfs-find-root.static
-btrfs-image
-btrfs-corrupt-block
-btrfs-select-super
-btrfs-crc
-btrfstune
-mktables
-libbtrfs.a
-libbtrfs.so
-libbtrfs.so.0
-libbtrfs.so.0.1
-library-test
-library-test-static
+
+/.cc-defines.h
+/version.h
+/btrfs
+/btrfs.static
+/btrfs-map-logical
+/btrfs-map-logical.static
+/btrfs-fragments
+/btrfs-fragments.static
+/btrfsck
+/mkfs.btrfs
+/mkfs.btrfs.static
+/btrfs-convert
+/btrfs-convert.static
+/btrfs-find-root
+/btrfs-find-root.static
+/btrfs-image
+/btrfs-image.static
+/btrfs-corrupt-block
+/btrfs-corrupt-block.static
+/btrfs-select-super
+/btrfs-select-super.static
+/btrfs-crc
+/btrfstune
+/btrfstune.static
+/mktables
+
+/libbtrfs.a
+/libbtrfs.so*
+/library-test
+/library-test-static
 /libbtrfsutil.so*
 /libbtrfsutil.a
-/fssum
-testsuite-id
 
+/fssum
+/testsuite-id
 /tests/*-tests-results.txt
 /tests/test-console.txt
 /tests/test.img
 /tests/mnt/
 *.restored
+/ioctl-test
+/send-test
+/quick-test
 
-aclocal.m4
-autom4te.cache
-compile
-config.cache
-config.guess
-config.h
-config.h.in
-config.h.in~
-config.log
-config.rpath
-config.status
-config.sub
-config/ltmain.sh
-config/py-compile
-config/test-driver
-configure
-cscope.out
+/aclocal.m4
+/autom4te.cache
+/config.cache
+/config/*
+/config.h
+/config.h.in
+/config.h.in~
+/config.log
+/config.status
+/configure
+/Makefile.inc
+
+/tags
+/cscope.out
+/cscope.files
+/cscope.in.out
+/cscope.po.out
 .clang_complete
-depcomp
-libtool
-Makefile.inc
-Documentation/Makefile
-missing
-mkinstalldirs
-stamp-h
-stamp-h.in
-stamp-h1
-config/*
+
+/Documentation/Makefile
+/Documentation/*.html
+/Documentation/btrfs-balance.8
+/Documentation/btrfs-check.8
+/Documentation/btrfs-convert.8
+/Documentation/btrfs-device.8
+/Documentation/btrfs-filesystem.8
+/Documentation/btrfs-find-root.8
+/Documentation/btrfs-image.8
+/Documentation/btrfs-inspect-internal.8
+/Documentation/btrfs-ioctl.3
+/Documentation/btrfs-man5.5
+/Documentation/btrfs-map-logical.8
+/Documentation/btrfs-property.8
+/Documentation/btrfs-qgroup.8
+/Documentation/btrfs-quota.8
+/Documentation/btrfs-receive.8
+/Documentation/btrfs-replace.8
+/Documentation/btrfs-rescue.8
+/Documentation/btrfs-restore.8
+/Documentation/btrfs-scrub.8
+/Documentation/btrfs-select-super.8
+/Documentation/btrfs-send.8
+/Documentation/btrfs-subvolume.8
+/Documentation/btrfs.8
+/Documentation/btrfstune.8
+/Documentation/fsck.btrfs.8
+/Documentation/mkfs.btrfs.8
 
 *.patch