diff --git a/.gitignore b/.gitignore
index bc34fc2dcdf..1d6ee9e3614 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,90 +1,88 @@
-*~
-\#*\#
-\#*
-.#*
-*.x86
-*.llvm
-*.out
-*.boot
-*.rustc
-*.cmx
-*.dll
-*.def
-*.exe
 *.a
-*.rlib
-*.so
-*.dylib
-*.orig
-*.cmo
-*.cmi
-*.dSYM
-*.d
-*.o
-*.ll
-*.bc
 *.aux
+*.bc
+*.boot
+*.bz2
+*.cmi
+*.cmo
+*.cmx
 *.cp
-*.fn
-*.ky
 *.cps
-*.log
-*.pdf
+*.d
+*.dSYM
+*.def
+*.diff
+*.dll
+*.dylib
+*.elc
 *.epub
+*.exe
+*.fn
 *.html
+*.ky
+*.ll
+*.llvm
+*.log
+*.o
+*.orig
+*.out
+*.patch
+*.pdf
 *.pg
+*.pot
+*.pyc
+*.rej
+*.rlib
+*.rustc
+*.so
+*.swo
+*.swp
+*.tmp
 *.toc
 *.tp
 *.vr
-*.patch
-*.diff
-*.rej
-*.swp
-*.swo
-*.tmp
-*.pyc
-*.elc
+*.x86
+*~
+.#*
+.DS_Store
+.cproject
 .hg/
 .hgignore
-.cproject
 .project
+.settings/
 .valgrindrc
-lexer.ml
-TAGS
-TAGS.emacs
-TAGS.vi
-version.ml
-version.texi
+/*-*-*-*/
+/*-*-*/
 /Makefile
-config.mk
+/build
+/dist/
+/dl/
+/doc
+/inst/
+/llvm/
+/mingw-build/
+/nd/
 /rt/
 /rustllvm/
-/test/
-/inst/
-/mingw-build/
-src/.DS_Store
-/tmp/
-/dist/
 /stage0/
-/dl/
 /stage1/
 /stage2/
 /stage3/
-*.bz2
-/doc
-/nd/
-/llvm/
-version.md
-keywords.md
-x86_64-apple-darwin/
-x86_64-unknown-linux-gnu/
-i686-unknown-linux-gnu/
-tmp.*.rs
+/test/
+/tmp/
+TAGS
+TAGS.emacs
+TAGS.vi
+\#*
+\#*\#
+config.mk
 config.stamp
-.DS_Store
+keywords.md
+lexer.ml
+src/.DS_Store
 src/etc/dl
-.settings/
-/build
-i686-pc-mingw32/
 src/librustc_llvm/llvmdeps.rs
-*.pot
+tmp.*.rs
+version.md
+version.ml
+version.texi