diff --git a/Build/BundledPrograms.hs b/Build/BundledPrograms.hs
index d1f8cfd4a7..dd78994b04 100644
--- a/Build/BundledPrograms.hs
+++ b/Build/BundledPrograms.hs
@@ -45,7 +45,12 @@ bundledPrograms = catMaybes
 #endif
 	, SysConfig.gpg
 	, ifset SysConfig.curl "curl"
+#ifndef darwin_HOST_OS
+	-- wget on OSX has been problimatic, looking for certs in the wrong
+	-- places. Don't ship it, use curl or the OSX's own wget if it has
+	-- one.
 	, ifset SysConfig.wget "wget"
+#endif
 	, ifset SysConfig.bup "bup"
 	, SysConfig.lsof
 	, SysConfig.gcrypt
diff --git a/debian/changelog b/debian/changelog
index 996f0ef043..f5cfb995e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ git-annex (5.20140406) UNRELEASED; urgency=medium
 
   * importfeed: Filename template can now contain an itempubdate variable.
     Needs feed 0.3.9.2.
+  * Remove wget from OSX dmg, due to issues with cert paths that broke
+    git-annex automatic upgrading. Instead, curl is used, unless the
+    OSX system has wget installed, which will then be used.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 07 Apr 2014 16:22:02 -0400