diff --git a/doc/NERD_commenter.txt b/doc/NERD_commenter.txt
index 2a3aabe..409e0d4 100644
--- a/doc/NERD_commenter.txt
+++ b/doc/NERD_commenter.txt
@@ -852,9 +852,13 @@ if your face looked like a toaster and a t-rex put together? :(
 ==============================================================================
 7. Changelog                                                *NERDComChangelog*
 
+2.1.17
+    - fixed haskell delimiters (hackily). Thanks to Elias Pipping.
+
 2.1.16
     - compatibility fix for vim7.2, cheers to Ben Schmidt, David Fishburn, and
       Erik Falor for the emails, and to JaGoTerr for posting the issue.
+
 2.1.15
     - added pamconf support, thanks to Martin Kustermann
     - added mason support, thanks to Indriði Einarsson
@@ -1195,6 +1199,8 @@ Thanks to tpope for the english lesson.
 Thanks to Ben Schmidt, David Fishburn, and Erik Falor for emailing me about an
 incompatibility with vim7.2. Thanks also to JaGoTerr for posting the issue.
 
+Thanks to Elias Pipping for sending me a bug report about haskell commenting.
+
 Not to forget! Thanks to the following people for sending me new filetypes to
 support :D
 
diff --git a/plugin/NERD_commenter.vim b/plugin/NERD_commenter.vim
index 4c5a5e4..1e1265a 100644
--- a/plugin/NERD_commenter.vim
+++ b/plugin/NERD_commenter.vim
@@ -384,7 +384,7 @@ function s:SetUpForNewFiletype(filetype, forceReset)
     elseif a:filetype == "gtkrc"
         call s:MapDelimiters('#', '')
     elseif a:filetype == "haskell"
-        call s:MapDelimitersWithAlternative('--','', '{-', '-}')
+        call s:MapDelimitersWithAlternative('{-','-}', '--', '--')
     elseif a:filetype == "hb"
         call s:MapDelimiters('#', '')
     elseif a:filetype == "h"