diff --git a/security/libssh/Makefile b/security/libssh/Makefile
new file mode 100644
index 00000000000..2fff5038a30
--- /dev/null
+++ b/security/libssh/Makefile
@@ -0,0 +1,32 @@
+# $OpenBSD: Makefile,v 1.1.1.1 2011/07/18 17:38:47 rpointel Exp $
+
+COMMENT =		C library implementing server and client side
+DISTNAME =		libssh-0.5.0
+
+SHARED_LIBS +=  	ssh		0.0 # 4.2
+SHARED_LIBS +=  	ssh_threads	0.0 # 4.2
+
+CATEGORIES =		security devel
+
+HOMEPAGE =		http://www.libssh.org/
+MASTER_SITES =		${HOMEPAGE}files/0.5/
+
+MAINTAINER =		Remi Pointel <rpointel@openbsd.org>
+
+# LGPL v2.1
+PERMIT_PACKAGE_CDROM =	Yes
+PERMIT_PACKAGE_FTP =	Yes
+PERMIT_DISTFILES_CDROM =Yes
+PERMIT_DISTFILES_FTP =	Yes
+
+WANTLIB += crypto ssl z
+
+MODULES =		devel/cmake
+
+WRKBUILD =		${WRKDIST}/build/
+
+BUILD_DEPENDS =		devel/cmockery
+
+CONFIGURE_ARGS +=	-DWITH_TESTING=ON
+
+.include <bsd.port.mk>
diff --git a/security/libssh/distinfo b/security/libssh/distinfo
new file mode 100644
index 00000000000..711278c9eaa
--- /dev/null
+++ b/security/libssh/distinfo
@@ -0,0 +1,5 @@
+MD5 (libssh-0.5.0.tar.gz) = mzf0V1HArnumYJnB+xNpRg==
+RMD160 (libssh-0.5.0.tar.gz) = Iq9nks+mzKjFNx/GChYH90ic7ig=
+SHA1 (libssh-0.5.0.tar.gz) = 7HKi4j+X1BLEZfi6l9aIZ5VQrBg=
+SHA256 (libssh-0.5.0.tar.gz) = S/0JZ20ctmZ8/HeKJynIX8jjvbathdZmGrl2QZ9PmTw=
+SIZE (libssh-0.5.0.tar.gz) = 314429
diff --git a/security/libssh/patches/patch-tests_unittests_torture_misc_c b/security/libssh/patches/patch-tests_unittests_torture_misc_c
new file mode 100644
index 00000000000..6b5ceeea0a4
--- /dev/null
+++ b/security/libssh/patches/patch-tests_unittests_torture_misc_c
@@ -0,0 +1,13 @@
+$OpenBSD: patch-tests_unittests_torture_misc_c,v 1.1.1.1 2011/07/18 17:38:47 rpointel Exp $
+--- tests/unittests/torture_misc.c.orig	Tue May 31 16:29:52 2011
++++ tests/unittests/torture_misc.c	Fri Jul  8 15:25:08 2011
+@@ -195,7 +195,8 @@
+ #ifdef _WIN32
+         unit_test(torture_path_expand_tilde_win),
+ #else
+-        unit_test(torture_path_expand_tilde_unix),
++	/* failed with our make regress ("env -i"), need a real user to be tested.
++        unit_test(torture_path_expand_tilde_unix), */
+ #endif
+         unit_test_setup_teardown(torture_path_expand_escape, setup, teardown),
+         unit_test_setup_teardown(torture_path_expand_known_hosts, setup, teardown),
diff --git a/security/libssh/pkg/DESCR b/security/libssh/pkg/DESCR
new file mode 100644
index 00000000000..0b4965dc549
--- /dev/null
+++ b/security/libssh/pkg/DESCR
@@ -0,0 +1,4 @@
+libssh is a multiplatform C library implementing the SSHv2 and SSHv1
+protocol on client and server side. With libssh, you can remotely
+execute programs, transfer files, use a secure and transparent tunnel
+for your remote applications.
diff --git a/security/libssh/pkg/PFRAG.shared b/security/libssh/pkg/PFRAG.shared
new file mode 100644
index 00000000000..cd0d2e7d3fe
--- /dev/null
+++ b/security/libssh/pkg/PFRAG.shared
@@ -0,0 +1,3 @@
+@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2011/07/18 17:38:47 rpointel Exp $
+@lib lib/libssh.so.${LIBssh_VERSION}
+@lib lib/libssh_threads.so.${LIBssh_threads_VERSION}
diff --git a/security/libssh/pkg/PLIST b/security/libssh/pkg/PLIST
new file mode 100644
index 00000000000..d4309fd5681
--- /dev/null
+++ b/security/libssh/pkg/PLIST
@@ -0,0 +1,13 @@
+@comment $OpenBSD: PLIST,v 1.1.1.1 2011/07/18 17:38:47 rpointel Exp $
+%%SHARED%%
+include/libssh/
+include/libssh/callbacks.h
+include/libssh/legacy.h
+include/libssh/libssh.h
+include/libssh/server.h
+include/libssh/sftp.h
+include/libssh/ssh2.h
+lib/libssh.a
+lib/libssh_threads_static.a
+lib/pkgconfig/
+lib/pkgconfig/libssh.pc