diff --git a/Build/Configure.hs b/Build/Configure.hs
index 0926496f82..d255df7949 100644
--- a/Build/Configure.hs
+++ b/Build/Configure.hs
@@ -1,5 +1,7 @@
 {- Checks system configuration and generates SysConfig.hs. -}
 
+{-# LANGUAGE CPP #-}
+
 module Build.Configure where
 
 import System.Directory
@@ -53,8 +55,8 @@ tests =
 	, (384, "38b060a751ac96384cd9327eb1b1e36a21fdb71114be07434c0cc7bf63f6e1da274edebfe76f65fbd51ad2f14898b95b")
 	]
 
-{- shaNsum are the program names used by coreutils. Some systems like OSX
- - sometimes install these with 'g' prefixes.
+{- shaNsum are the program names used by coreutils. Some systems
+ - install these with 'g' prefixes.
  -
  - On some systems, shaN is used instead, but on other
  - systems, it might be "hashalot", which does not produce
@@ -74,13 +76,13 @@ shaTestCases l = map make l
 				then return $ Just c
 				else search cmds
 	
-	shacmds n = concatMap (\x -> [x, 'g':x, osxpath </> x]) $
+#ifndef darwin_HOST_OS
+	shacmds n = concatMap (\x -> [x, 'g':x]) $
 		map (\x -> "sha" ++ show n ++ x) ["sum", ""]
-
-	{- Max OSX sometimes puts GNU tools outside PATH, so look in
-	 - the location it uses, and remember where to run them
-	 - from. -}
-	osxpath = "/opt/local/libexec/gnubin"
+#else
+	-- OSX has had problems with gsha*sum crashing, so do not use.
+	shacmds _ = []
+#endif
 
 tmpDir :: String
 tmpDir = "tmp"
diff --git a/doc/bugs/gsha256sum_crashes.mdwn b/doc/bugs/gsha256sum_crashes.mdwn
index f536aea691..1e4630697b 100644
--- a/doc/bugs/gsha256sum_crashes.mdwn
+++ b/doc/bugs/gsha256sum_crashes.mdwn
@@ -78,3 +78,6 @@ Everything up-to-date
 """]]
 
 I can send you the crash report of hsha256sum if you need it.
+
+> Fine, we'll stop using this on OSX, since git-annex has its own builtin
+> and not even much slower hashers. [[done]] --[[Joey]]