diff --git a/.gitignore b/.gitignore
index 9f2cba3bf..f22f1bd49 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,24 +1,53 @@
-build
-*~
-Doxygen
-prebuilt
-apps/openmw/config.hpp
-Docs/mainpage.hpp
+## make
 CMakeFiles
 */CMakeFiles
 CMakeCache.txt
-moc_*.cxx
 cmake_install.cmake
-*.[ao]
+CMakeLists.txt.user
 Makefile
 makefile
-data
+build
+prebuilt
+
+## doxygen
+Doxygen
+
+## ides/editors
+*~
 *.kdev4
-CMakeLists.txt.user
 *.swp
 *.swo
 *.kate-swp
 .cproject
 .project
-.settings/
+.settings
 .directory
+
+## resources
+data
+resources
+/*.cfg
+/*.desktop
+/*.install
+
+## binaries
+/esmtool
+/mwiniimport
+/omwlauncher
+/openmw
+/opencs
+
+## generated objects
+apps/openmw/config.hpp
+Docs/mainpage.hpp
+moc_*.cxx
+*.cxx_parameters
+*qrc_launcher.cxx
+*qrc_resources.cxx
+*__*
+*ui_datafilespage.h
+*ui_graphicspage.h
+*ui_mainwindow.h
+*ui_playpage.h
+*.[ao]
+*.so