2 files changed, 10 insertions, 1 deletions

diff --git a/README b/README
index 42f5218..3cbcab1 100644
--- a/README
+++ b/README
@@ -105,4 +105,5 @@ in the Haskell mailing lists for their help.
 - Reiner Pope added support for luSolve, based on (d|z)getrs.
 
 - Simon Beaumont reported the need of QuickCheck<2 and the invalid
-  asm("finit") on ppc.
+  asm("finit") on ppc. He also contributed the configuration options
+  for the accelerate framework on OS X.
diff --git a/hmatrix.cabal b/hmatrix.cabal
index 114be5d..516e6b5 100644
--- a/hmatrix.cabal
+++ b/hmatrix.cabal
@@ -23,6 +23,10 @@ flag mkl
     description:    Link with Intel's MKL optimized libraries.
     default:        False
 
+flag accelerate
+    description:    Use the accelerate framework for LAPACK/BLAS on OS X
+    default:        False
+
 flag unsafe
     description: Compile the library with bound checking disabled.
     default: False
@@ -110,6 +114,10 @@ library
       else
         extra-libraries:   gsl mkl_lapack mkl_intel mkl_sequential mkl_core
     else
+      if flag(accelerate)
+        frameworks: Accelerate
+        extra-libraries: gsl
+      else
 
         extra-libraries: gsl lapack