diff --git a/ChangeLog b/ChangeLog
index 25c474f60..e018f3e7f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-08-29  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
+
+ * data/snippets.conf:
+   Add dummy entry for "do" snippet for Haskell to explicitly avoid the
+   default completion.
+
+
 2010-08-25  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
 
  * src/build.c:
diff --git a/data/snippets.conf b/data/snippets.conf
index eab2d275a..461024388 100644
--- a/data/snippets.conf
+++ b/data/snippets.conf
@@ -63,3 +63,6 @@ class=class %cursor%:\n\t""" Class doc """\n\t\n\tdef __init__ (self):\n\t\t"""
 iferr=iferr%block_cursor%fix%block%
 monitor=monitor%block_cursor%handle%block%
 
+[Haskell]
+# prevent completion of "do"-while-loops in Haskell
+do=