diff --git a/ChangeLog.md b/ChangeLog.md
new file mode 100644
--- /dev/null
+++ b/ChangeLog.md
@@ -0,0 +1,21 @@
+# ChangeLog for hsndfile
+
+## Version 0.3.2
+
+* [__USER__] **hsndfile** has been adapted to compile with GHC 6.10. The only
+  visible change is in exception handling:
+    * `Sound.File.Sndfile.Exception.Exception` is now an instance of
+      `Control.Exception.Exception`
+    * The new generalized functions from `Control.Exception.Exception` are
+      used for throwing and handling exceptions
+
+## Version 0.2.0
+
+* [__BUGFIX__] Fix exception throwing Exceptions detected in library code are
+  now actually raised. Exception has been factored into
+  Sound.File.Sndfile.Exception and constructors were added according to the
+  public libsndfile error codes.
+* [__BUGFIX__] Fix reading/writing of frames hGetFrames and hPutFrames were
+  using the sample-based library functions. These have been factored into
+  Sound.File.Sndfile.Buffer and the correct functions are being used for the
+  frame-based I/O functions.
diff --git a/README.md b/README.md
new file mode 100644
--- /dev/null
+++ b/README.md
@@ -0,0 +1,34 @@
+# HSndfile
+
+HSndfile is a Haskell interface to Eric de Castro Lopo's [libsndfile][1].
+
+# Build requirements
+
+* ghc 6.X.X (tested with ghc-6.8.1)
+* c2hs
+
+# Build instructions
+
+Build the library
+
+    $ runhaskell Setup.hs configure
+    $ runhaskell Setup.hs build
+
+Build the documentation
+
+    $ runhaskell Setup.hs haddock
+
+# Installation
+
+    # runhaskell Setup.hs install
+
+# Usage
+
+The interface is very similar to [libsndfile's][1] C API, although some
+changes were made in order to conform to Haskell naming conventions.
+
+# TODO
+
+* TODO: sf_command interface
+
+[1]: http://www.mega-nerd.com/libsndfile/
diff --git a/Sound/File/Sndfile/Buffer.hs b/Sound/File/Sndfile/Buffer.hs
--- a/Sound/File/Sndfile/Buffer.hs
+++ b/Sound/File/Sndfile/Buffer.hs
@@ -1,6 +1,3 @@
-{-# LANGUAGE ForeignFunctionInterface #-}
-{-# LANGUAGE MultiParamTypeClasses #-}
-
 module Sound.File.Sndfile.Buffer
 (
     MBuffer(..),
diff --git a/Sound/File/Sndfile/Buffer/IOCArray.hs b/Sound/File/Sndfile/Buffer/IOCArray.hs
--- a/Sound/File/Sndfile/Buffer/IOCArray.hs
+++ b/Sound/File/Sndfile/Buffer/IOCArray.hs
@@ -1,5 +1,3 @@
-{-# OPTIONS_GHC -fglasgow-exts #-}
-
 module Sound.File.Sndfile.Buffer.IOCArray where
 
 import C2HS
diff --git a/Sound/File/Sndfile/Buffer/Storable.hs b/Sound/File/Sndfile/Buffer/Storable.hs
--- a/Sound/File/Sndfile/Buffer/Storable.hs
+++ b/Sound/File/Sndfile/Buffer/Storable.hs
@@ -1,5 +1,3 @@
-{-# OPTIONS_GHC -fglasgow-exts #-}
-
 module Sound.File.Sndfile.Buffer.Storable where
 
 import C2HS
diff --git a/Sound/File/Sndfile/Exception.hs b/Sound/File/Sndfile/Exception.hs
--- a/Sound/File/Sndfile/Exception.hs
+++ b/Sound/File/Sndfile/Exception.hs
@@ -1,5 +1,3 @@
-{-# OPTIONS_GHC -fglasgow-exts #-}
-
 module Sound.File.Sndfile.Exception (
     Exception(..),
     catch, throw
diff --git a/Sound/File/Sndfile/Interface.chs b/Sound/File/Sndfile/Interface.chs
--- a/Sound/File/Sndfile/Interface.chs
+++ b/Sound/File/Sndfile/Interface.chs
@@ -1,5 +1,3 @@
-{-# LANGUAGE ForeignFunctionInterface #-}
-
 module Sound.File.Sndfile.Interface where
 
 import C2HS
@@ -15,8 +13,12 @@
 -- ====================================================================
 -- Basic types
 
-type Count = Int -- ^ Type for expressing sample counts.
-type Index = Int -- ^ Type for expressing sample indices.
+
+-- | Type for expressing sample counts.
+type Count = Int
+
+-- | Type for expressing sample indices.
+type Index = Int
 
 -- ====================================================================
 -- Format
diff --git a/hsndfile.cabal b/hsndfile.cabal
--- a/hsndfile.cabal
+++ b/hsndfile.cabal
@@ -1,5 +1,5 @@
 name:                   hsndfile
-version:                0.3.2
+version:                0.3.3
 category:               Sound
 license:                GPL
 license-file:           COPYING
@@ -22,11 +22,16 @@
 cabal-version:          >= 1.2
 
 extra-source-files:
+                        ChangeLog.md
+                        README.md
                         libsndfile/sndfile.h
 
 library
   build-depends:        array, base >= 4.0.0.0, carray >= 0.1.2, haskell98
   build-tools:          c2hs >= 0.15
+  extensions:           DeriveDataTypeable
+                        ForeignFunctionInterface
+                        MultiParamTypeClasses
   exposed-modules:      Sound.File.Sndfile
   other-modules:        C2HS
                         Sound.File.Sndfile.Buffer