diff --git a/HTF.cabal b/HTF.cabal
--- a/HTF.cabal
+++ b/HTF.cabal
@@ -1,5 +1,5 @@
 Name:             HTF
-Version:          0.3.3
+Version:          0.3.4
 License:          LGPL
 License-File:     LICENSE
 Copyright:        (c) 2005-2010 Stefan Wehr
diff --git a/README b/README
--- a/README
+++ b/README
@@ -23,13 +23,11 @@
 Requirements:
 -------------
 
-- GHC (tested with 6.10.4)
+- GHC (tested with 6.10.4 and 6.12.3)
 - Some haskell libraries, see HTF.cabal
 
 
 Installation instructions:
 --------------------------
 
-runhaskell setup.hs configure
-runhaskell setup.hs build
-runhaskell setup.hs install   (probably as root)
+Execute the command `cabal install' inside the HTF root directory.
diff --git a/Test/Framework/HaskellParser.hs b/Test/Framework/HaskellParser.hs
--- a/Test/Framework/HaskellParser.hs
+++ b/Test/Framework/HaskellParser.hs
@@ -18,6 +18,7 @@
 module Test.Framework.HaskellParser where
 
 import Data.Maybe
+import Data.Char ( isSpace )
 import Control.Exception ( evaluate, catch, SomeException )
 import Prelude hiding ( catch )
 
@@ -52,9 +53,16 @@
          Parser.ParseFailed loc err -> return (ParseError (transformLoc loc) err)
          Parser.ParseOk m -> return $ ParseOK (transformModule m)
     where
+      -- fixedInput serves two purposes:
+      -- 1. add a trailing \n
+      -- 2. comment out lines starting with #
       fixedInput :: String
-      fixedInput = (input ++ "\n") {- the parser fails if the last line is a
-                                      line comment not ending with \n -}
+      fixedInput = (unlines . map fixLine . lines) input
+          where
+            fixLine s =
+                case dropWhile isSpace s of
+                  '#':_ -> "-- " ++ s
+                  _ -> s
       {- FIXME: fixities needed for all operators. Heuristic:
          all operators are considered to be any sequence
          of the symbols _:"'>!#$%&*+./<=>?@\^|-~ with at most length 8 -}