diff --git a/Git/UnionMerge.hs b/Git/UnionMerge.hs
index d4dc35e4aa..780861a413 100644
--- a/Git/UnionMerge.hs
+++ b/Git/UnionMerge.hs
@@ -55,8 +55,8 @@ mergeTrees (Ref x) (Ref y) h = doMerge h $ "diff-tree":diffOpts ++ [x, y]
 
 {- For merging a single tree into the index. -}
 mergeTreeIndex :: Ref -> CatFileHandle -> Repo -> Streamer
-mergeTreeIndex (Ref x) h = doMerge h $
-	"diff-index" : diffOpts ++ ["--cached", x]
+mergeTreeIndex (Ref r) h = doMerge h $
+	"diff-index" : diffOpts ++ ["--cached", r, "--"]
 
 diffOpts :: [String]
 diffOpts = ["--raw", "-z", "-r", "--no-renames", "-l0"]
diff --git a/debian/changelog b/debian/changelog
index cc7e1fa20d..f4afbc461f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 git-annex (5.20150410) UNRELEASED; urgency=medium
 
-  * Fix activity log parsing.
+  * Fix activity log parsing, which caused the log to not retain
+    activity from other uuids.
+  * Union merge could fall over if there was a file in the repository
+    with the same name as a git ref. Now fixed.
 
  -- Joey Hess <id@joeyh.name>  Thu, 09 Apr 2015 20:59:43 -0400