diff --git a/unison227-Fix-bad-interaction-with-OpenSSH-5.6.patch b/unison227-Fix-bad-interaction-with-OpenSSH-5.6.patch
new file mode 100644
index 0000000..c839105
--- /dev/null
+++ b/unison227-Fix-bad-interaction-with-OpenSSH-5.6.patch
@@ -0,0 +1,23 @@
+From: Stephane Glondu <steph@glondu.net>
+Date: Sun, 3 Apr 2011 11:44:19 +0200
+Subject: Fix bad interaction with OpenSSH 5.6
+
+Origin: https://bugs.archlinux.org/task/20877
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=620031
+---
+ terminal.ml |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/terminal.ml b/terminal.ml
+index 657f3d2..aafa425 100644
+--- a/terminal.ml
++++ b/terminal.ml
+@@ -191,7 +191,6 @@ let create_session cmd args new_stdin new_stdout new_stderr =
+             exit 127
+           end
+       | childPid ->
+-          Unix.close slaveFd;
+           (Some masterFd, childPid)
+       end
+ 
+-- 
diff --git a/unison227-ocaml312.patch b/unison227-ocaml312.patch
new file mode 100644
index 0000000..24005e8
--- /dev/null
+++ b/unison227-ocaml312.patch
@@ -0,0 +1,11 @@
+--- unison-2.27.57/update.mli.old	2012-01-16 14:08:18.784651309 +0000
++++ unison-2.27.57/update.mli	2012-01-16 14:08:35.414983940 +0000
+@@ -1,7 +1,7 @@
+ (* Unison file synchronizer: src/update.mli *)
+ (* Copyright 1999-2007 (see COPYING for details) *)
+ 
+-module NameMap : Map.S with type key = Name.t
++module NameMap : MyMap.S with type key = Name.t
+ 
+ type archive =
+     ArchiveDir of Props.t * archive NameMap.t
diff --git a/unison227.spec b/unison227.spec
index 654bd23..8b3b504 100644
--- a/unison227.spec
+++ b/unison227.spec
@@ -23,7 +23,7 @@
 
 Name:      unison%{ver_compat_name}
 Version:   %{ver_compat}%{ver_noncompat}
-Release:   14%{?dist}
+Release:   16%{?dist}
 
 Summary:   Multi-master File synchronization tool
 
@@ -32,11 +32,15 @@ License:   GPL+
 URL:       http://www.cis.upenn.edu/~bcpierce/unison
 Source0:   http://www.cis.upenn.edu/~bcpierce/unison/download/releases/unison-%{version}/unison-%{version}.tar.gz
 Source1:   unison.png
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 ExcludeArch:    sparc64 s390 s390x
 
-BuildRequires: ocaml >= 3.10.2-2
-BuildRequires: ocaml-lablgtk-devel >= 2.6.0
+# Fix for OCaml 3.12.
+Patch0:    %{name}-ocaml312.patch
+# RBZ #813156
+Patch1:    %{name}-Fix-bad-interaction-with-OpenSSH-5.6.patch
+
+BuildRequires: ocaml
+BuildRequires: ocaml-lablgtk-devel
 BuildRequires: tetex-latex
 BuildRequires: desktop-file-utils
 # for lablgtk
@@ -66,6 +70,8 @@ exist if you require a different major version.
 
 %prep
 %setup -q -n unison-%{version}
+%patch0 -p1
+%patch1 -p1
 
 %build
 make NATIVE=true UISTYLE=gtk2
@@ -88,16 +94,12 @@ Terminal=false
 Icon=unison-%{ver_compat}
 Encoding=UTF-8
 StartupNotify=true
+Categories=Utility;
 EOF
 
-desktop-file-install --vendor fedora \
-    --add-category Application \
-    --add-category Utility \
-    --dir %{buildroot}%{_datadir}/applications \
+desktop-file-install --dir %{buildroot}%{_datadir}/applications \
     unison-%{ver_compat}.desktop
 
-%clean
-rm -rf %{buildroot}
 
 %posttrans
 alternatives \
@@ -121,13 +123,19 @@ fi
 exit 0
 
 %files
-%defattr(0644,root,root,0755)
 %doc COPYING NEWS README
 %attr(0755, root, root) %{_bindir}/unison-%{ver_compat}
-%{_datadir}/applications/fedora-unison-%{ver_compat}.desktop
+%{_datadir}/applications/unison-%{ver_compat}.desktop
 %{_datadir}/pixmaps/unison-%{ver_compat}.png
 
 %changelog
+* Wed Jun 06 2012 Gregor Tätzner <brummbq@fedoraproject.org> - 2.27.57-16
+- Include fix for RBZ 813156
+- Spec file cleanup
+
+* Mon Jan 16 2012 Richard W.M. Jones <rjones@redhat.com> - 2.27.57-15
+- Include fix for OCaml 3.12.
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.27.57-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild