diff --git a/.gitignore b/.gitignore
index 95de933df..bc0ad52f1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,14 +1,27 @@
+### How to update
+# This is copied from OpenHFT/.gitignore
+# update the original and run OpenHFT/update_gitignore.sh
+
+### Compiled class file
 *.class
 
-# Mobile Tools for Java (J2ME)
-#.mtj.tmp/
-/target
-# Package Files #
+### Package Files
 *.jar
 *.war
 *.ear
+
+### Log file
+*.log
+
+### IntelliJ
 *.iml
-.idea*
+*.ipr
+*.iws
+.idea
+.attach_pid*
+
+### Virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
 
 ### Maven template
 target/
@@ -18,7 +31,6 @@ pom.xml.versionsBackup
 pom.xml.next
 release.properties
 
-
 ### Eclipse template
 *.pydevproject
 .metadata
@@ -30,89 +42,11 @@ tmp/
 *.swp
 *~.nib
 local.properties
+.classpath
+.project
 .settings/
 .loadpath
 
-# External tool builders
-.externalToolBuilders/
-
-# Locally stored "Eclipse launch configurations"
-*.launch
-
-# CDT-specific
-.cproject
-
-# PDT-specific
-.buildpath
-
-# sbteclipse plugin
-.target
-
-# TeXlipse plugin
-.texlipse
-
-
-### JetBrains template
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm
-
-*.iml
-
-## Directory-based project format:
-.idea/
-# if you remove the above rule, at least ignore the following:
-
-# User-specific stuff:
-# .idea/workspace.xml
-# .idea/tasks.xml
-# .idea/dictionaries
-
-# Sensitive or high-churn files:
-# .idea/dataSources.ids
-# .idea/dataSources.xml
-# .idea/sqlDataSources.xml
-# .idea/dynamic.xml
-# .idea/uiDesigner.xml
-
-# Gradle:
-# .idea/gradle.xml
-# .idea/libraries
-
-# Mongo Explorer plugin:
-# .idea/mongoSettings.xml
-
-## File-based project format:
-*.ipr
-*.iws
-
-## Plugin-specific files:
-
-# IntelliJ
-out/
-
-# mpeltonen/sbt-idea plugin
-.idea_modules/
-
-# JIRA plugin
-atlassian-ide-plugin.xml
-
-# Crashlytics plugin (for Android Studio and IntelliJ)
-com_crashlytics_export_strings.xml
-crashlytics.properties
-crashlytics-build.properties
-
-
-### Java template
-*.class
-
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
-
-# Package Files #
-*.jar
-*.war
-*.ear
-
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
-
-
+### Queue files
+*.cq4t
+*.cq4