diff --git a/alsa-pcm.cabal b/alsa-pcm.cabal
--- a/alsa-pcm.cabal
+++ b/alsa-pcm.cabal
@@ -1,5 +1,5 @@
 Name:          alsa-pcm
-Version:       0.6.0.1
+Version:       0.6.0.2
 Copyright:     Bjorn Bringert, Iavor S. Diatchki, Henning Thielemann
 Maintainer:    Henning Thielemann <alsa@henning-thielemann.de>
 Author:        Henning Thielemann <alsa@henning-thielemann.de>, Bjorn Bringert <bjorn@bringert.net>, Iavor S. Diatchki <iavor.diatchki@gmail.com>
@@ -9,7 +9,7 @@
 Homepage:      http://www.haskell.org/haskellwiki/ALSA
 Stability:     Experimental
 Build-Type:    Simple
-Cabal-Version: >= 1.8
+Cabal-Version: >= 1.14
 
 Synopsis: Binding to the ALSA Library API (PCM audio).
 Description:
@@ -28,7 +28,7 @@
 Source-Repository this
   type:     darcs
   location: http://code.haskell.org/alsa/pcm/
-  tag:      0.6.0.1
+  tag:      0.6.0.2
 
 Flag buildExamples
   description: Build example executables
@@ -73,8 +73,8 @@
     Sound.ALSA.PCM.Core.SwParams
     Sound.ALSA.PCM.Debug
 
+  Default-Language: Haskell2010
   GHC-Options: -Wall -fwarn-tabs
-  Includes: alsa/asoundlib.h
   PkgConfig-depends: alsa >= 1.0.14
 
 
@@ -82,123 +82,83 @@
   Main-Is: synth.hs
   If flag(buildSynthesizer)
     Build-Depends:
+      alsa-pcm,
       alsa-seq >=0.6 && <0.7,
-      alsa-core >=0.5 && <0.6,
       containers >=0.2 && <0.6,
       transformers >=0.2 && <0.4,
       storablevector >=0.2.7 && <0.3,
-      storable-record >=0.0.2 && <0.1,
-      sample-frame >=0.0.1 && <0.1,
-      base >=3 && <5
+      base
   Else
     Buildable: False
-  Hs-Source-Dirs: src, debug, examples
-  Include-Dirs: src
+  Default-Language: Haskell2010
   GHC-Options: -Wall -threaded
-  Other-modules:
-    Sound.ALSA.PCM
-    Sound.ALSA.PCM.Core.Class
-    Sound.ALSA.PCM.Core.Handle
-    Sound.ALSA.PCM.Core.HwParams
-    Sound.ALSA.PCM.Core.SwParams
+  Hs-Source-Dirs: examples
+  If flag(debug)
+    Hs-Source-Dirs: debug
+  Else
+    Hs-Source-Dirs: nodebug
 
 Executable alsa-sine
   Main-Is: sine.hs
   If flag(buildSynthesizer)
     Build-Depends:
-      alsa-core >=0.5 && <0.6,
+      alsa-pcm,
       storablevector >=0.2.7 && <0.3,
-      storable-record >=0.0.2 && <0.1,
-      sample-frame >=0.0.1 && <0.1,
-      base >=3 && <5
+      base
   Else
     Buildable: False
-  Hs-Source-Dirs: src, debug, examples
-  Include-Dirs: src
+  Default-Language: Haskell2010
   GHC-Options: -Wall -threaded
-  Other-modules:
-    Sound.ALSA.PCM
-    Sound.ALSA.PCM.Core.Class
-    Sound.ALSA.PCM.Core.Handle
-    Sound.ALSA.PCM.Core.HwParams
-    Sound.ALSA.PCM.Core.SwParams
+  Hs-Source-Dirs: examples
+  If flag(debug)
+    Hs-Source-Dirs: debug
+  Else
+    Hs-Source-Dirs: nodebug
 
 Executable alsa-duplex
   Main-Is: duplex.hs
   If flag(buildExamples)
     Build-Depends:
-      alsa-core >=0.5 && <0.6,
-      storable-record >=0.0.2 && <0.1,
-      sample-frame >=0.0.1 && <0.1,
-      base >=3 && <5
+      alsa-pcm,
+      base
   Else
     Buildable: False
-  Hs-Source-Dirs: src, debug, examples
-  Include-Dirs: src
+  Default-Language: Haskell2010
   GHC-Options: -Wall -threaded
-  Other-modules:
-    Sound.ALSA.PCM
-    Sound.ALSA.PCM.Core.Class
-    Sound.ALSA.PCM.Core.Handle
-    Sound.ALSA.PCM.Core.HwParams
-    Sound.ALSA.PCM.Core.SwParams
+  Hs-Source-Dirs: examples
 
 Executable alsa-play
   Main-Is: play.hs
   If flag(buildExamples)
     Build-Depends:
-      alsa-core >=0.5 && <0.6,
-      storable-record >=0.0.2 && <0.1,
-      sample-frame >=0.0.1 && <0.1,
-      base >=3 && <5
+      alsa-pcm,
+      base
   Else
     Buildable: False
-  Hs-Source-Dirs: src, debug, examples
-  Include-Dirs: src
+  Default-Language: Haskell2010
   GHC-Options: -Wall -threaded
-  Other-modules:
-    Sound.ALSA.PCM
-    Sound.ALSA.PCM.Core.Class
-    Sound.ALSA.PCM.Core.Handle
-    Sound.ALSA.PCM.Core.HwParams
-    Sound.ALSA.PCM.Core.SwParams
+  Hs-Source-Dirs: examples
 
 Executable alsa-record
   Main-Is: record.hs
   If flag(buildExamples)
     Build-Depends:
-      alsa-core >=0.5 && <0.6,
-      storable-record >=0.0.2 && <0.1,
-      sample-frame >=0.0.1 && <0.1,
-      base >=3 && <5
+      alsa-pcm,
+      base
   Else
     Buildable: False
-  Hs-Source-Dirs: src, debug, examples
-  Include-Dirs: src
+  Default-Language: Haskell2010
   GHC-Options: -Wall -threaded
-  Other-modules:
-    Sound.ALSA.PCM
-    Sound.ALSA.PCM.Core.Class
-    Sound.ALSA.PCM.Core.Handle
-    Sound.ALSA.PCM.Core.HwParams
-    Sound.ALSA.PCM.Core.SwParams
+  Hs-Source-Dirs: examples
 
 Executable alsa-volume-meter
   Main-Is: volume_meter.hs
   If flag(buildExamples)
     Build-Depends:
-      alsa-core >=0.5 && <0.6,
-      storable-record >=0.0.2 && <0.1,
-      sample-frame >=0.0.1 && <0.1,
-      base >=3 && <5
+      alsa-pcm,
+      base
   Else
     Buildable: False
-  Hs-Source-Dirs: src, debug, examples
-  Include-Dirs: src
+  Default-Language: Haskell2010
   GHC-Options: -Wall -threaded
-  Other-modules:
-    Sound.ALSA.PCM
-    Sound.ALSA.PCM.Core.Class
-    Sound.ALSA.PCM.Core.Handle
-    Sound.ALSA.PCM.Core.HwParams
-    Sound.ALSA.PCM.Core.SwParams
+  Hs-Source-Dirs: examples