diff --git a/Git/Merge.hs b/Git/Merge.hs
index 76ea35ddd5..a0767e462e 100644
--- a/Git/Merge.hs
+++ b/Git/Merge.hs
@@ -45,9 +45,9 @@ merge' extraparams branch mergeconfig commitmode r
 merge'' :: [CommandParam] -> [MergeConfig] -> Repo -> IO Bool
 merge'' ps mergeconfig r
 	| MergeUnrelatedHistories `elem` mergeconfig =
-		ifM (Git.Version.older "2.8.2")
-			( go (ps ++ [Param "--allow-unrelated-histories"])
-			, go ps
+		ifM (Git.Version.older "2.9.0")
+			( go ps
+			, go (ps ++ [Param "--allow-unrelated-histories"])
 			)
 	| otherwise = go ps
   where
diff --git a/debian/changelog b/debian/changelog
index f19b7141ec..e536c5029b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,7 +14,7 @@ git-annex (6.20160419) UNRELEASED; urgency=medium
     to refer to a file.
   * Fix bug that prevented annex.sshcaching=false configuration from taking
     effect when on a crippled filesystem. Thanks, divergentdave.
-  * git 2.8.2 is going to prevent git merge from merging in unrelated
+  * git 2.9.0 is going to prevent git merge from merging in unrelated
     branches. Since the webapp's pairing etc features often combine
     together repositories with unrelated histories, work around
     this behavior change when the assistant merges, by passing