diff --git a/.gitignore b/.gitignore
index 9765b030..a7d1c410 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,56 +1,135 @@
+# Ignores specific to OpenTK.
+Binaries/
+OpenTK.userprefs
+Source/GlobalAssemblyInfo.cs
+Version.txt
 
-#OS junk files
-[Tt]humbs.db
-*.DS_Store
+# OpenTK Resource files that seem like they should be ignored:
+Source/Compatibility/Properties/Resources.resources
+Source/Compatibility/Tao/Platform/Windows/SimpleOpenGlControl.resources
+Source/Examples/ExampleBrowser.resources
+Source/Examples/OpenAL/1.1/Parrot.resources
+Source/Examples/OpenTK/Fonts/FontRenderingBasic.resources
+Source/Examples/OpenTK/GLControl/DerivedGLControl.resources
+Source/Examples/OpenTK/GLControl/GLControlGameLoop.resources
+Source/Examples/OpenTK/GLControl/GLControlSimple.resources
+Source/Examples/OpenTK/GLControl/MultipleGLControls.resources
+Source/Examples/OpenTK/Test/Extensions.resources
+Source/Examples/OpenTK/Test/InputLogger.resources
+Source/Examples/Properties/Resources.resources
+Source/OpenTK/Properties/Resources.resources
 
-#Visual Studio files
-*.exe
-*.pdb
+
+# Build Folders (you can keep bin if you'd like, to store dlls and pdbs)
+[Bb]in/
+[Oo]bj/
+
+# mstest test results
+TestResults
+
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+
+# User-specific files
+*.suo
 *.user
-*.aps
-*.pch
-*.vspscc
-*.vssscc
+*.sln.docstates
+
+# Build results
+[Dd]ebug/
+[Rr]elease/
+x64/
 *_i.c
 *_p.c
-*.ncb
-*.suo
-*.tlb
-*.tlh
-*.bak
-*.[Cc]ache
 *.ilk
-*.log
-*.lib
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
 *.sbr
-*.sdf
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.log
+*.vspscc
+*.vssscc
+.builds
+
+# Visual C++ cache files
 ipch/
-obj/
-[Bb]in
-[Dd]ebug*/
-[Rr]elease*/
-Ankh.NoLoad
+*.aps
+*.ncb
+*.opensdf
+*.sdf
 
-#Tooling
-_ReSharper*/
-*.resharper
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*
+
+# Mindbench SASS cache
+.sass-cache/
+
+# NCrunch
+*.ncrunch*
+.*crunch*.local.xml
+
+# Installshield output folder 
+[Ee]xpress
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish
+
+# Publish Web Output
+*.Publish.xml
+
+# NuGet Packages Directory
+packages
+
+# Windows Azure Build Output
+csx
+*.build.csdef
+
+# Windows Store app package directory
+AppPackages/
+
+# Others
+sql
+TestResults
 [Tt]est[Rr]esult*
-
-#Project files
-[Bb]uild/
-
-#Subversion files
-.svn
-
-# Office Temp Files
+*.Cache
+ClientBin
+[Ss]tyle[Cc]op.*
 ~$*
+*.dbmdl
+Generated_Code #added for RIA/Silverlight projects
 
-#MonoDevelop files
-*.userprefs
-*.pidb
+# Backup & report files from converting an old project file to a newer
+# Visual Studio version. Backup files are not needed, because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
 
-#Generated
-/Version.txt
-/Source/GlobalAssemblyInfo.cs
-/Source/OpenTK/OpenTK.xml
-/Source/GLControl/OpenTK.GLControl.xml
+# SQL Server files
+App_Data/*.mdf
+App_Data/*.ldf
\ No newline at end of file