diff --git a/libssh-channel-close.patch b/libssh-0.5.4-channel-close.patch
similarity index 100%
rename from libssh-channel-close.patch
rename to libssh-0.5.4-channel-close.patch
diff --git a/libssh-0.5.4-disable-latex-documentation.patch b/libssh-0.5.4-disable-latex-documentation.patch
new file mode 100644
index 0000000..7498f4e
--- /dev/null
+++ b/libssh-0.5.4-disable-latex-documentation.patch
@@ -0,0 +1,15 @@
+Description: Be sure we never build LaTeX documentation
+Author: Laurent Bigonville <bigon@debian.org>
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=622108
+
+--- a/doc/doxy.config.in
++++ b/doc/doxy.config.in
+@@ -1014,7 +1014,7 @@
+ # If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
+ # generate Latex output.
+ 
+-GENERATE_LATEX         = @DOXYFILE_LATEX@
++GENERATE_LATEX         = NO
+ 
+ # The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
+ # If a relative path is entered the value of OUTPUT_DIRECTORY will be
diff --git a/libssh-0.5.4-fix-html-doc-generation.patch b/libssh-0.5.4-fix-html-doc-generation.patch
new file mode 100644
index 0000000..c63f002
--- /dev/null
+++ b/libssh-0.5.4-fix-html-doc-generation.patch
@@ -0,0 +1,16 @@
+Description: Do not exclude "*/build/*" directory as buildd use that path
+Author: Laurent Bigonville <bigon@debian.org>
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libssh/+bug/821437
+
+--- a/doc/doxy.config.in
++++ b/doc/doxy.config.in
+@@ -631,8 +631,7 @@
+ 
+ EXCLUDE_PATTERNS       = */.git/* \
+                          */.svn/* \
+-                         */cmake/* \
+-                         */build/*
++                         */cmake/*
+ 
+ # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
+ # (namespaces, classes, functions, etc.) that should be excluded from the
diff --git a/libssh-0.5.4-fix-typo.patch b/libssh-0.5.4-fix-typo.patch
new file mode 100644
index 0000000..a2d61b9
--- /dev/null
+++ b/libssh-0.5.4-fix-typo.patch
@@ -0,0 +1,14 @@
+Subject: Fix typo
+From: Laurent Bigonville <bigon@debian.org>
+
+--- a/src/server.c
++++ b/src/server.c
+@@ -186,7 +186,7 @@ static int dh_handshake_server(ssh_sessi
+     default:
+       ssh_set_error(session,
+                     SSH_FATAL,
+-                    "Could determine the specified hostkey");
++                    "Could not determine the specified hostkey");
+       ssh_string_free(f);
+       return -1;
+   }