diff --git a/patches/openssh/Notes b/patches/openssh/Notes
new file mode 100644
index 0000000000..6b7fc36e22
--- /dev/null
+++ b/patches/openssh/Notes
@@ -0,0 +1,26 @@
+Notes for OpenSSH 4.7p1 (Haiku r24683)
+======================================
+
+configure
+---------
+
+  rm config.sub config.guess
+  automake --add-missing
+  autoreconf --force
+
+  ./configure --prefix=/boot/home/config --with-ssl-dir=/boot/home/config
+
+* automake will fail, but it will replace config.{sub,guess} anyway, which is
+  all we want.
+* Edit config.h:
+  - Undefined HAVE_CONTROL_IN_MSGHDR: Haiku doesn't really support it.
+  - define HAVE_U_INT64_T: Only to get rid of warnings while compiling. The
+    configure test only includes <sys/types.h>, which doesn't define Haiku's
+    u_int64_t (<stdint.h> does).
+
+make/install
+------------
+
+  make
+  make install
+
diff --git a/patches/openssh/openssh-4.7p1.diff b/patches/openssh/openssh-4.7p1.diff
new file mode 100644
index 0000000000..641dd108c1
--- /dev/null
+++ b/patches/openssh/openssh-4.7p1.diff
@@ -0,0 +1,13 @@
+diff -ur openssh-4.7p1-orig/includes.h openssh-4.7p1/includes.h
+--- openssh-4.7p1-orig/includes.h	2007-06-11 06:44:03.000000000 +0200
++++ openssh-4.7p1/includes.h	2008-03-29 03:00:42.000000000 +0100
+@@ -109,7 +109,9 @@
+ #endif
+ 
+ #include <netinet/in.h>
++#ifndef __HAIKU__
+ #include <netinet/in_systm.h> /* For typedefs */
++#endif
+ #ifdef HAVE_RPC_TYPES_H
+ # include <rpc/types.h> /* For INADDR_LOOPBACK */
+ #endif