diff --git a/.gitignore b/.gitignore
index c6b1d70..4f7baf9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,14 +1,38 @@
+# Install directories
+/bin/
+/cfg/
+/db/
+/dbd/
+/html/
+/include/
+/lib/
+/templates/
+
+# Local configuration files
+/configure/*.local
+/configure/os
+
+# iocBoot generated files
+/iocBoot/*ioc*/cdCommands
+/iocBoot/*ioc*/dllPath.bat
+/iocBoot/*ioc*/envPaths
+/iocBoot/*ioc*/relPaths.sh
+
+# iocsh
+.iocsh_history
+
+# Build directories
+O.*/
+_build/
+
+# Common files created by other tools
+.DS_Store
+
+# Python related
 *.pyc
 *.pyo
+python*
+
+# extras
 *~
 *.dbl
-O.*
-bin
-include
-lib
-db
-dbd
-python*
-_build
-envPaths
-configure/os
diff --git a/configure/.gitignore b/configure/.gitignore
deleted file mode 100644
index 2ad9294..0000000
--- a/configure/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.local