 -#define ASKPASS_PROGRAM         "/usr/lib/ssh/ssh-askpass"
 +#define ASKPASS_PROGRAM         HAIKU_COMMON_BIN_DIRECTORY "/ssh/ssh-askpass"
  #endif /* ASKPASS_PROGRAM */
+diff -urN openssh-5.8p2/version.h openssh-5.8p2-haiku/version.h
+--- openssh-5.8p2/version.h	2011-02-04 00:48:57.027262976 +0000
++++ openssh-5.8p2-haiku/version.h	2011-05-04 16:05:12.604504064 +0000
+@@ -2,5 +2,5 @@
+ 
+ #define SSH_VERSION	"OpenSSH_5.8"
+ 
+-#define SSH_PORTABLE	"p1"
++#define SSH_PORTABLE	"p2"
+ #define SSH_RELEASE	SSH_VERSION SSH_PORTABLE

 /* for sftp */
 #ifndef _PATH_SFTP_SERVER
-#define _PATH_SFTP_SERVER		"/usr/libexec/sftp-server"
+#define _PATH_SFTP_SERVER		HAIKU_COMMON_SERVERS_DIRECTORY "/sftp-server"
 #endif
 
 /* chroot directory for unprivileged user when UsePrivilegeSeparation=yes */

diff -urN openssh-5.8p2/configure.ac openssh-5.8p2-haiku/configure.ac
--- openssh-5.8p2/configure.ac	2011-02-04 00:42:14.007077888 +0000
+++ openssh-5.8p2-haiku/configure.ac	2011-05-04 16:01:02.093585408 +0000
@@ -1345,7 +1345,7 @@
 			LIBEDIT=`$PKGCONFIG --libs-only-l libedit`
 			CPPFLAGS="$CPPFLAGS `$PKGCONFIG --cflags libedit`"
 		else
