diff --git a/security/libssh2/Makefile b/security/libssh2/Makefile
index c98790dccc1..7f9366476b9 100644
--- a/security/libssh2/Makefile
+++ b/security/libssh2/Makefile
@@ -1,12 +1,12 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2008/05/15 21:20:00 merdely Exp $
+# $OpenBSD: Makefile,v 1.2 2009/06/03 22:46:42 merdely Exp $
 
 COMMENT =		library implementing the SSH2 protocol
 
-DISTNAME =		libssh2-0.18
+DISTNAME =		libssh2-1.1
 CATEGORIES =		security
 HOMEPAGE =		http://www.libssh2.org/
 MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=libssh2/}
-SHARED_LIBS +=		ssh2	1.0	# .1.0
+SHARED_LIBS +=		ssh2	2.0	# .1.0
 
 MAINTAINER =		Eric Sproul <eric@nanobyte.org>
 
@@ -19,6 +19,10 @@ PERMIT_DISTFILES_FTP =	Yes
 
 CONFIGURE_STYLE =	gnu
 USE_LIBTOOL =		Yes
-WANTLIB =		crypto z
+WANTLIB =		crypto ssl z
+
+# The second test will only pass if public key auth is configured for ${USER}
+REGRESS_IS_INTERACTIVE = Yes
+REGRESS_FLAGS="USER=${USER}"
 
 .include <bsd.port.mk>
diff --git a/security/libssh2/distinfo b/security/libssh2/distinfo
index a72d5da60d3..2204155aa4f 100644
--- a/security/libssh2/distinfo
+++ b/security/libssh2/distinfo
@@ -1,5 +1,5 @@
-MD5 (libssh2-0.18.tar.gz) = W5yDZgqk0YIf8sBYOOd+nQ==
-RMD160 (libssh2-0.18.tar.gz) = IIjHOnkDgoZw4UxiiaaWH1o+R2Q=
-SHA1 (libssh2-0.18.tar.gz) = m8YUiGn8oINQ4n6iyfxEkXrAJ/8=
-SHA256 (libssh2-0.18.tar.gz) = aWSlhp11fIyfZCVr2vz/MCgmrPmJgVCtpp6yKbMBfMw=
-SIZE (libssh2-0.18.tar.gz) = 541428
+MD5 (libssh2-1.1.tar.gz) = +KPrm7gU4KWiu3alQj9RKQ==
+RMD160 (libssh2-1.1.tar.gz) = bMPW3PNReLhkbvwYxHILVZcgu+A=
+SHA1 (libssh2-1.1.tar.gz) = 89ZciiTG6AkDZrmQHpvpen0/OOI=
+SHA256 (libssh2-1.1.tar.gz) = UHt6YLfK/u8HHFipPSw8nuBwkqYdWrKa7nPoxMbHAgo=
+SIZE (libssh2-1.1.tar.gz) = 582185
diff --git a/security/libssh2/pkg/PLIST b/security/libssh2/pkg/PLIST
index 8eae5378370..8cb83888b95 100644
--- a/security/libssh2/pkg/PLIST
+++ b/security/libssh2/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2008/05/15 21:20:00 merdely Exp $
+@comment $OpenBSD: PLIST,v 1.2 2009/06/03 22:46:42 merdely Exp $
 %%SHARED%%
 include/libssh2.h
 include/libssh2_publickey.h
@@ -6,6 +6,7 @@ include/libssh2_sftp.h
 lib/libssh2.a
 lib/libssh2.la
 @man man/man3/libssh2_banner_set.3
+@man man/man3/libssh2_base64_decode.3
 @man man/man3/libssh2_channel_close.3
 @man man/man3/libssh2_channel_direct_tcpip_ex.3
 @man man/man3/libssh2_channel_eof.3
@@ -20,11 +21,17 @@ lib/libssh2.la
 @man man/man3/libssh2_channel_open_ex.3
 @man man/man3/libssh2_channel_process_startup.3
 @man man/man3/libssh2_channel_read_ex.3
+@man man/man3/libssh2_channel_receive_window_adjust.3
+@man man/man3/libssh2_channel_receive_window_adjust2.3
 @man man/man3/libssh2_channel_request_pty_ex.3
 @man man/man3/libssh2_channel_send_eof.3
 @man man/man3/libssh2_channel_set_blocking.3
 @man man/man3/libssh2_channel_setenv_ex.3
+@man man/man3/libssh2_channel_wait_closed.3
 @man man/man3/libssh2_channel_wait_eof.3
+@man man/man3/libssh2_channel_window_read_ex.3
+@man man/man3/libssh2_channel_window_write_ex.3
+@man man/man3/libssh2_channel_write_ex.3
 @man man/man3/libssh2_channel_x11_req_ex.3
 @man man/man3/libssh2_hostkey_hash.3
 @man man/man3/libssh2_poll.3
@@ -32,10 +39,11 @@ lib/libssh2.la
 @man man/man3/libssh2_scp_recv.3
 @man man/man3/libssh2_scp_send_ex.3
 @man man/man3/libssh2_session_abstract.3
+@man man/man3/libssh2_session_block_directions.3
 @man man/man3/libssh2_session_callback_set.3
 @man man/man3/libssh2_session_disconnect_ex.3
 @man man/man3/libssh2_session_free.3
-@man man/man3/libssh2_session_init.3
+@man man/man3/libssh2_session_init_ex.3
 @man man/man3/libssh2_session_last_errno.3
 @man man/man3/libssh2_session_last_error.3
 @man man/man3/libssh2_session_method_pref.3
@@ -49,7 +57,7 @@ lib/libssh2.la
 @man man/man3/libssh2_sftp_mkdir_ex.3
 @man man/man3/libssh2_sftp_open_ex.3
 @man man/man3/libssh2_sftp_read.3
-@man man/man3/libssh2_sftp_readdir.3
+@man man/man3/libssh2_sftp_readdir_ex.3
 @man man/man3/libssh2_sftp_rename_ex.3
 @man man/man3/libssh2_sftp_rmdir_ex.3
 @man man/man3/libssh2_sftp_seek.3
@@ -57,9 +65,13 @@ lib/libssh2.la
 @man man/man3/libssh2_sftp_stat_ex.3
 @man man/man3/libssh2_sftp_symlink_ex.3
 @man man/man3/libssh2_sftp_tell.3
+@man man/man3/libssh2_sftp_tell64.3
 @man man/man3/libssh2_sftp_unlink_ex.3
 @man man/man3/libssh2_sftp_write.3
+@man man/man3/libssh2_trace.3
 @man man/man3/libssh2_userauth_authenticated.3
+@man man/man3/libssh2_userauth_keyboard_interactive_ex.3
 @man man/man3/libssh2_userauth_list.3
 @man man/man3/libssh2_userauth_password_ex.3
-@man man/man3/libssh2_userauth_publickey_fromfile.3
+@man man/man3/libssh2_userauth_publickey_fromfile_ex.3
+@man man/man3/libssh2_version.3