diff --git a/HFuse.cabal b/HFuse.cabal
--- a/HFuse.cabal
+++ b/HFuse.cabal
@@ -1,14 +1,15 @@
 Name:                   HFuse
-Version:                0.2.4
+Version:                0.2.4.1
 License:                BSD3
-License-File:		LICENSE
+License-File:           LICENSE
 Author:                 Jeremy Bobbio
-Maintainer: 		Taru Karttunen <taruti@taruti.net>
+Maintainer:             Paul van der Walt <cabal@denknerd.org>
 Synopsis:               HFuse is a binding for the Linux FUSE library.
-Homepage:               https://github.com/realdesktop/hfuse
+Description:            Bindings for the FUSE library, compatible with OSXFUSE.
+Homepage:               https://github.com/toothbrush/hfuse
 Category:               System
 Stability:              Experimental
-Cabal-Version:          >= 1.2
+Cabal-Version:          >= 1.6
 Build-Type:             Simple
 Extra-source-files:     README
 
@@ -16,12 +17,19 @@
   Build-Depends:          base >= 4 && < 5, unix, bytestring
   exposed-Modules:        System.Fuse
   Extensions:             ForeignFunctionInterface ScopedTypeVariables EmptyDataDecls
-  Includes:               sys/statfs.h, dirent.h, fuse.h, fcntl.h
+  Includes:               dirent.h, fuse.h, fcntl.h
   Include-Dirs:           /usr/include, /usr/local/include, .
+  if os(darwin) {
+      CC-Options:           "-DMACFUSE"
+      CC-Options:           "-DFUSE_USE_VERSION=26"
+      Include-Dirs:           /usr/local/include/osxfuse
+  } else {
+      Includes:               sys/statfs.h
+  }
   Extra-Libraries:        fuse
   Extra-Lib-Dirs:         /usr/local/lib
   CC-Options:             -D_FILE_OFFSET_BITS=64
-  if os(darwin) {
-    CC-Options:           "-DMACFUSE"
-  }
 
+source-repository head
+    type:       head
+    location:   https://github.com/toothbrush/hfuse.git
diff --git a/README b/README
--- a/README
+++ b/README
@@ -1,9 +1,9 @@
 Programs using HFuse should be compiled with -threaded.
 
 HelloFS seems to work with:
-* Linux 2.6.39
-* The Glorious Glasgow Haskell Compilation System, version 7.0.3
-* fuse-2.8.5
+* Linux 2.6.24
+* The Glorious Glasgow Haskell Compilation System, version 6.8.2
+* fuse-2.6
 
 BindFS (?) is known to have a lurking deadlock problem.
 
diff --git a/System/Fuse.hsc b/System/Fuse.hsc
--- a/System/Fuse.hsc
+++ b/System/Fuse.hsc
@@ -20,6 +20,7 @@
 -- option).
 --
 -----------------------------------------------------------------------------
+{-# LANGUAGE FlexibleContexts #-}
 module System.Fuse
     ( -- * Using FUSE