diff --git a/security/ruby-net-ssh/Makefile b/security/ruby-net-ssh/Makefile
index ce17d3eb6c10..894f6f031c0c 100644
--- a/security/ruby-net-ssh/Makefile
+++ b/security/ruby-net-ssh/Makefile
@@ -1,15 +1,12 @@
-# $NetBSD: Makefile,v 1.2 2009/12/02 14:26:28 fhajny Exp $
+# $NetBSD: Makefile,v 1.3 2010/09/10 07:44:40 taca Exp $
 
-DISTNAME=	net-ssh-2.0.16
-PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME}
+DISTNAME=	net-ssh-2.0.23
 CATEGORIES=	net security
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://rubyforge.org/projects/net-ssh/
+HOMEPAGE=	http://github.com/net-ssh/net-ssh
 COMMENT=	Secure shell for Ruby
 LICENSE=	mit
 
-GEM_BUILD=	gemspec
-
-.include "../../misc/rubygems/rubygem.mk"
+.include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/ruby-net-ssh/PLIST b/security/ruby-net-ssh/PLIST
index b4c2dd7ce426..d0563068f150 100644
--- a/security/ruby-net-ssh/PLIST
+++ b/security/ruby-net-ssh/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.3 2009/12/02 14:26:29 fhajny Exp $
-${GEM_HOME}/cache/net-ssh-${PKGVERSION}.gem
+@comment $NetBSD: PLIST,v 1.4 2010/09/10 07:44:40 taca Exp $
+${GEM_HOME}/cache/${GEM_NAME}.gem
 ${GEM_LIBDIR}/CHANGELOG.rdoc
 ${GEM_LIBDIR}/Manifest
 ${GEM_LIBDIR}/README.rdoc
@@ -73,6 +73,7 @@ ${GEM_LIBDIR}/net-ssh.gemspec
 ${GEM_LIBDIR}/setup.rb
 ${GEM_LIBDIR}/support/arcfour_check.rb
 ${GEM_LIBDIR}/support/ssh_tunnel_bug.rb
+${GEM_LIBDIR}/test/README.txt
 ${GEM_LIBDIR}/test/authentication/methods/common.rb
 ${GEM_LIBDIR}/test/authentication/methods/test_abstract.rb
 ${GEM_LIBDIR}/test/authentication/methods/test_hostbased.rb
@@ -85,10 +86,14 @@ ${GEM_LIBDIR}/test/authentication/test_session.rb
 ${GEM_LIBDIR}/test/common.rb
 ${GEM_LIBDIR}/test/configs/eqsign
 ${GEM_LIBDIR}/test/configs/exact_match
+${GEM_LIBDIR}/test/configs/host_plus
 ${GEM_LIBDIR}/test/configs/multihost
+${GEM_LIBDIR}/test/configs/nohost
+${GEM_LIBDIR}/test/configs/numeric_host
 ${GEM_LIBDIR}/test/configs/wild_cards
 ${GEM_LIBDIR}/test/connection/test_channel.rb
 ${GEM_LIBDIR}/test/connection/test_session.rb
+${GEM_LIBDIR}/test/manual/test_forward.rb
 ${GEM_LIBDIR}/test/test_all.rb
 ${GEM_LIBDIR}/test/test_buffer.rb
 ${GEM_LIBDIR}/test/test_buffered_io.rb
@@ -109,4 +114,4 @@ ${GEM_LIBDIR}/test/transport/test_packet_stream.rb
 ${GEM_LIBDIR}/test/transport/test_server_version.rb
 ${GEM_LIBDIR}/test/transport/test_session.rb
 ${GEM_LIBDIR}/test/transport/test_state.rb
-${GEM_HOME}/specifications/net-ssh-${PKGVERSION}.gemspec
+${GEM_HOME}/specifications/${GEM_NAME}.gemspec
diff --git a/security/ruby-net-ssh/distinfo b/security/ruby-net-ssh/distinfo
index a26830fe3f06..02dbdc04cd1b 100644
--- a/security/ruby-net-ssh/distinfo
+++ b/security/ruby-net-ssh/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2009/12/02 14:26:29 fhajny Exp $
+$NetBSD: distinfo,v 1.3 2010/09/10 07:44:40 taca Exp $
 
-SHA1 (net-ssh-2.0.16.gem) = a7437ae98b5aa95be65c45ed19b6a72f21cea23f
-RMD160 (net-ssh-2.0.16.gem) = 96b714c1eb036eac6bf0e101922c17d10715680d
-Size (net-ssh-2.0.16.gem) = 126464 bytes
+SHA1 (net-ssh-2.0.23.gem) = eebb76621e240faf11ac8e8dae2349879d2247e2
+RMD160 (net-ssh-2.0.23.gem) = 1dc7d9a4f3f98901b2bdf7fcdc06a17492adf809
+Size (net-ssh-2.0.23.gem) = 129536 bytes