diff --git a/llvm-ffi.cabal b/llvm-ffi.cabal
--- a/llvm-ffi.cabal
+++ b/llvm-ffi.cabal
@@ -1,5 +1,5 @@
 Name:          llvm-ffi
-Version:       3.6.0
+Version:       3.7.0
 License:       BSD3
 License-File:  LICENSE
 Synopsis:      FFI bindings to the LLVM compiler toolkit.
@@ -15,7 +15,7 @@
   using the @llvm-pkg-config@ package.
   .
   We try to stay up to date with LLVM releases.
-  The current version of this package is compatible with LLVM 3.4-3.6.
+  The current version of this package is compatible with LLVM 3.4-3.7.
   Please understand that the package may or may not work
   against older LLVM releases.
 Author:        Henning Thielemann, Bryan O'Sullivan, Lennart Augustsson
@@ -39,6 +39,7 @@
 
 Flag buildExamples
   Description: Build example executables
+  Manual: True
   Default: False
 
 Flag specificPkgConfig
@@ -53,12 +54,16 @@
   Description: use LLVM-3.5 instead of latest supported LLVM
   Default: False
 
+Flag llvm306
+  Description: use LLVM-3.6 instead of latest supported LLVM
+  Default: False
+
 Source-Repository head
   Type:     darcs
   Location: http://hub.darcs.net/thielema/llvm-ffi/
 
 Source-Repository this
-  Tag:      3.6.0
+  Tag:      3.7.0
   Type:     darcs
   Location: http://hub.darcs.net/thielema/llvm-ffi/
 
@@ -115,12 +120,20 @@
       CC-Options: -DHS_LLVM_VERSION=305
       CPP-Options: -DHS_LLVM_VERSION=305
     Else
-      If flag(specificPkgConfig)
-        PkgConfig-Depends: llvm-3.6
+      If flag(llvm306)
+        If flag(specificPkgConfig)
+          PkgConfig-Depends: llvm-3.6
+        Else
+          PkgConfig-Depends: llvm == 3.6
+        CC-Options: -DHS_LLVM_VERSION=306
+        CPP-Options: -DHS_LLVM_VERSION=306
       Else
-        PkgConfig-Depends: llvm == 3.6
-      CC-Options: -DHS_LLVM_VERSION=306
-      CPP-Options: -DHS_LLVM_VERSION=306
+        If flag(specificPkgConfig)
+          PkgConfig-Depends: llvm-3.7
+        Else
+          PkgConfig-Depends: llvm == 3.7
+        CC-Options: -DHS_LLVM_VERSION=307
+        CPP-Options: -DHS_LLVM_VERSION=307
 
   CC-Options: -DHAVE_LLVM_SUPPORT_DYNAMICLIBRARY_H=1
   CPP-Options: -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS
diff --git a/src/LLVM/FFI/Target.hsc b/src/LLVM/FFI/Target.hsc
--- a/src/LLVM/FFI/Target.hsc
+++ b/src/LLVM/FFI/Target.hsc
@@ -55,9 +55,9 @@
     :: TargetDataRef -> TypeRef -> IO CULLong
 foreign import ccall unsafe "LLVMStoreSizeOfType" storeSizeOfType
     :: TargetDataRef -> TypeRef -> IO CULLong
-foreign import ccall unsafe "LLVMABISizeOfType" aBISizeOfType
+foreign import ccall unsafe "LLVMABISizeOfType" abiSizeOfType
     :: TargetDataRef -> TypeRef -> IO CULLong
-foreign import ccall unsafe "LLVMABIAlignmentOfType" aBIAlignmentOfType
+foreign import ccall unsafe "LLVMABIAlignmentOfType" abiAlignmentOfType
     :: TargetDataRef -> TypeRef -> IO CULLong
 foreign import ccall unsafe "LLVMCallFrameAlignmentOfType" callFrameAlignmentOfType
     :: TargetDataRef -> TypeRef -> IO CULLong