diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+* 0.11.0.1 (2013-09-03)
+  - support for containers-0.4.* (thanks to M. Snoyman)
+
 * 0.11.0.0 (2013-08-31)
   - fallback to pure Haskell diff if no diff binary found (thanks JP Moresmau)
   - use cabal test feature (thanks Tom Brow)
diff --git a/HTF.cabal b/HTF.cabal
--- a/HTF.cabal
+++ b/HTF.cabal
@@ -1,5 +1,5 @@
 Name:             HTF
-Version:          0.11.0.0
+Version:          0.11.0.1
 License:          LGPL
 License-File:     LICENSE
 Copyright:        (c) 2005-2012 Stefan Wehr
@@ -153,7 +153,7 @@
                     QuickCheck >= 2.3,
                     base == 4.*,
                     random >= 1.0,
-                    containers >= 0.5,
+                    containers >= 0.4.2.1,
                     process >= 1.0,
                     directory >= 1.0,
                     mtl >= 1.1 && < 2.2,
diff --git a/Setup.hs b/Setup.hs
--- a/Setup.hs
+++ b/Setup.hs
@@ -1,5 +1,2 @@
-#!/usr/bin/runhaskell
-
 import Distribution.Simple
-
 main = defaultMain
diff --git a/Test/Framework/XmlOutput.hs b/Test/Framework/XmlOutput.hs
--- a/Test/Framework/XmlOutput.hs
+++ b/Test/Framework/XmlOutput.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
 {- |
 
 See <http://pzolee.blogs.balabit.com/2012/11/jenkins-vs-junit-xml-format/>
@@ -16,7 +17,11 @@
 
 import qualified Data.ByteString.Lazy as BSL
 import qualified Data.List as List
+#if MIN_VERSION_containers(0,5,0)
 import qualified Data.Map.Strict as Map
+#else
+import qualified Data.Map as Map
+#endif
 import qualified Data.Text as T
 import Text.Printf