diff --git a/README b/README
--- a/README
+++ b/README
@@ -21,6 +21,10 @@
 News
 ----
 
+**hinotify 0.3.1**
+:   * Use `inotify.h` from `glibc` rather than from the linux headers, as
+      recommended upstream.
+
 **hinotify 0.3**
 :   * Compiles with GHC 6.12, GHC 6.10.4, GHC 6.8.2 and GHC 6.6.1
 
@@ -100,4 +104,4 @@
 
 [homepage]: http://haskell.org/~kolmodin/code/hinotify/
 
-[API]: http://haskell.org/~kolmodin/code/hinotify/docs/api/
+[API]: http://hackage.haskell.org/packages/archive/hinotify/latest/doc/html/System-INotify.html
diff --git a/hinotify.cabal b/hinotify.cabal
--- a/hinotify.cabal
+++ b/hinotify.cabal
@@ -1,5 +1,5 @@
 name:               hinotify
-version:            0.3
+version:            0.3.1
 build-type:         Simple
 synopsis:           Haskell binding to INotify
 description:
diff --git a/src/System/INotify.hsc b/src/System/INotify.hsc
--- a/src/System/INotify.hsc
+++ b/src/System/INotify.hsc
@@ -32,7 +32,7 @@
     , Cookie
     ) where
 
-#include "linux/inotify.h"
+#include "sys/inotify.h"
 
 import Prelude hiding (init)
 import Control.Monad
@@ -328,6 +328,6 @@
 withINotify :: (INotify -> IO a) -> IO a
 withINotify = bracket initINotify killINotify
         
-foreign import ccall unsafe "inotify-syscalls.h inotify_init" c_inotify_init :: IO CInt
-foreign import ccall unsafe "inotify-syscalls.h inotify_add_watch" c_inotify_add_watch :: CInt -> CString -> CUInt -> IO CInt
-foreign import ccall unsafe "inotify-syscalls.h inotify_rm_watch" c_inotify_rm_watch :: CInt -> CInt -> IO CInt
+foreign import ccall unsafe "sys/inotify.h inotify_init" c_inotify_init :: IO CInt
+foreign import ccall unsafe "sys/inotify.h inotify_add_watch" c_inotify_add_watch :: CInt -> CString -> CUInt -> IO CInt
+foreign import ccall unsafe "sys/inotify.h inotify_rm_watch" c_inotify_rm_watch :: CInt -> CInt -> IO CInt
diff --git a/src/System/INotify/Masks.hsc b/src/System/INotify/Masks.hsc
--- a/src/System/INotify/Masks.hsc
+++ b/src/System/INotify/Masks.hsc
@@ -31,7 +31,7 @@
 import Data.Maybe
 import Foreign.C.Types
 
-#include "linux/inotify.h"
+#include "sys/inotify.h"
 
 data Mask
     = UserSpace CUInt