diff --git a/.gitignore b/.gitignore
index d18afb7..74dc816 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,27 +1,76 @@
-setup.cfg
-MANIFEST
-build
-dist
-*.pdb
-*.pyc
-*.pyo
-tmp
-TAGS
-pyodbc.egg-info
-pyodbc.conf
-/venv*
-
-# The Access unit tests copy empty.accdb and empty.mdb to these names and use them.
-test.accdb
-test.mdb
-
-# JetBrain's IDE
-.idea/
-
-# Visual Studio IDE
-.vs/
-*.sln
-*.vcxproj*
-
-# Visual Studio build folder
-x64/
\ No newline at end of file
+# This file is based largely on the GitHub .gitignore template for Python:
+# https://github.com/github/gitignore/blob/master/Python.gitignore
+
+# Python
+__pycache__/
+*.py[cod]
+pyodbc.conf
+setup.cfg
+
+# C extensions
+*.so
+*.dll
+
+# Distribution / packaging
+build/
+dist/
+lib/
+lib64/
+MANIFEST
+/PKG-INFO
+sdist/
+wheelhouse/
+*.egg-info/
+*.egg
+
+# Unit test / coverage reports
+.tox/
+.coverage
+
+# Virtual Environments
+/venv*
+/.env/
+/.venv
+
+# JetBrains
+.idea/
+
+# Visual Studio
+.vscode/
+.vs/
+*.sln
+*.vcxproj*
+x64/
+x86/
+*.pdb
+
+# Executables
+*.exe
+
+# Other
+pyodbc.conf
+tmp
+tags
+
+# The Access unit tests copy empty.accdb and empty.mdb to these names and use them.
+test.accdb
+test.mdb
+
+setup.cfg
+*.pdb
+tmp
+
+# The Access unit tests copy empty.accdb and empty.mdb to these names and use them.
+test.accdb
+test.mdb
+
+# JetBrain's IDE
+.idea/
+
+# Visual Studio IDE
+.vs/
+*.sln
+*.vcxproj*
+
+# Visual Studio build folder
+x64/