diff --git a/ChangeLog b/ChangeLog
index 7cf60217..78c92313 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,8 @@
    doc/geany.html:
    Add hidden pref new_document_after_close for whether to open a new
    document automatically, off by default.
+ * HACKING:
+   Add 'Bugs to watch out for' section.
 
 
 2010-09-22  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
diff --git a/HACKING b/HACKING
index 33cee4f1..0a46d55d 100644
--- a/HACKING
+++ b/HACKING
@@ -250,6 +250,13 @@ Testing
   passing ``-c some_dir`` (but make sure the directory is clean first).
 * For debugging tips, see `GDB`_.
 
+Bugs to watch out for
+---------------------
+* Forgetting to check *doc->is_valid* when looping through
+  *documents_array* - instead use *foreach_document()*.
+* Not breaking the plugin ABI when necessary.
+* Using an idle callback that doesn't check main_status.quitting.
+
 Libraries
 ---------
 We try to use an unmodified version of Scintilla - any new lexers or