diff --git a/.gitignore b/.gitignore
index a9365cb33d..84e9edd9f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,18 +1,19 @@
-
+# ignore all obj and bin folders (even in subdirectories)
+obj/
+bin/
 /REVISION
-/bin/
 /build/
+/AddIns/
 /doc/ChangeLog.html
+/data/resources/StringResources.*.resources
 /src/AddIns/Analysis/Profiler/Controller/Data/UnmanagedCallTreeNode64.cs
 /src/AddIns/Analysis/Profiler/Controller/Profiler64.cs
 /src/AddIns/Analysis/Profiler/Controller/structs64.cs
 /src/AddIns/Analysis/Profiler/Hook/Callback.x64.obj
-/src/AddIns/Analysis/Profiler/bin/
-obj/
+/src/AddIns/Analysis/Profiler/Hook/x64
+/src/AddIns/Analysis/Profiler/Hook/Win32
 /src/Tools/UpdateAssemblyInfo/bin
-/src/AddIns/Misc/Profiler/X64Converter/bin
-/src/AddIns/Misc/Profiler/Hook/x64
-/src/AddIns/Misc/Profiler/Hook/Win32
 /src/Setup/SharpDevelop.Setup.wixproj.user
 /src/Main/ICSharpCode.SharpDevelop.Sda/ICSharpCode.SharpDevelop.Sda.dll.config
-/src/Main/StartUp/Project/SharpDevelop.exe.config
\ No newline at end of file
+/src/Main/StartUp/Project/SharpDevelop.exe.config
+/src/Main/GlobalAssemblyInfo.cs