diff --git a/devel/ruby-gems/Makefile b/devel/ruby-gems/Makefile
index 8733166ef45..34be920eae1 100644
--- a/devel/ruby-gems/Makefile
+++ b/devel/ruby-gems/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.25 2011/11/08 23:44:12 jeremy Exp $
+# $OpenBSD: Makefile,v 1.26 2012/04/27 18:41:07 jeremy Exp $
 
 COMMENT=	package management framework for the Ruby language
 
-V=		1.8.10
+V=		1.8.23
 DISTNAME=	rubygems-$V
 PKGNAME= 	ruby-gems-$V
 CATEGORIES=	devel
diff --git a/devel/ruby-gems/distinfo b/devel/ruby-gems/distinfo
index 6a2d531bc32..3d4e5feeea9 100644
--- a/devel/ruby-gems/distinfo
+++ b/devel/ruby-gems/distinfo
@@ -1,5 +1,5 @@
-MD5 (rubygems-1.8.10.tgz) = WwjuMXQMmwvTb2wE1Tfn1A==
-RMD160 (rubygems-1.8.10.tgz) = LH3EvFRZoLLPdxyTmPdQz+Dby/U=
-SHA1 (rubygems-1.8.10.tgz) = 0ujF2femnvLGqYCX/xkvI4sM4R8=
-SHA256 (rubygems-1.8.10.tgz) = OBUb1iqIuNCGf3rP1KrIPyxObf2eyZLtW5bEShzXhVI=
-SIZE (rubygems-1.8.10.tgz) = 249683
+MD5 (rubygems-1.8.23.tgz) = F4sOuueNu0aWPFGtKbtr2Q==
+RMD160 (rubygems-1.8.23.tgz) = YkxHUCMF+a6RrmrLSOh3Khh6LKg=
+SHA1 (rubygems-1.8.23.tgz) = rdlsiu1OEVJplbw1SiE8cqOTmAw=
+SHA256 (rubygems-1.8.23.tgz) = 5KHGu6rEEeqrlN6ueCKLdYQDOh8QoCL1K/+pYTqikGE=
+SIZE (rubygems-1.8.23.tgz) = 379999
diff --git a/devel/ruby-gems/patches/patch-lib_rubygems_commands_setup_command_rb b/devel/ruby-gems/patches/patch-lib_rubygems_commands_setup_command_rb
index be6c51b7396..0209dff1432 100644
--- a/devel/ruby-gems/patches/patch-lib_rubygems_commands_setup_command_rb
+++ b/devel/ruby-gems/patches/patch-lib_rubygems_commands_setup_command_rb
@@ -1,7 +1,7 @@
-$OpenBSD: patch-lib_rubygems_commands_setup_command_rb,v 1.3 2011/11/08 23:44:12 jeremy Exp $
---- lib/rubygems/commands/setup_command.rb.orig	Thu Aug 25 17:30:44 2011
-+++ lib/rubygems/commands/setup_command.rb	Sun Oct 30 20:35:07 2011
-@@ -273,7 +273,7 @@ TEXT
+$OpenBSD: patch-lib_rubygems_commands_setup_command_rb,v 1.4 2012/04/27 18:41:07 jeremy Exp $
+--- lib/rubygems/commands/setup_command.rb.orig	Thu Apr 19 21:29:58 2012
++++ lib/rubygems/commands/setup_command.rb	Mon Apr 23 12:49:58 2012
+@@ -283,7 +283,7 @@ TEXT
           lib_dir = Gem::ConfigMap[site_or_vendor]
           bin_dir = Gem::ConfigMap[:bindir]
        else
diff --git a/devel/ruby-gems/patches/patch-lib_rubygems_config_file_rb b/devel/ruby-gems/patches/patch-lib_rubygems_config_file_rb
index 4fce610b461..2e9b295dd15 100644
--- a/devel/ruby-gems/patches/patch-lib_rubygems_config_file_rb
+++ b/devel/ruby-gems/patches/patch-lib_rubygems_config_file_rb
@@ -1,12 +1,12 @@
-$OpenBSD: patch-lib_rubygems_config_file_rb,v 1.4 2011/11/08 23:44:12 jeremy Exp $
---- lib/rubygems/config_file.rb.orig	Thu Aug 25 17:30:44 2011
-+++ lib/rubygems/config_file.rb	Sun Oct 30 20:36:11 2011
-@@ -68,7 +68,7 @@ class Gem::ConfigFile
+$OpenBSD: patch-lib_rubygems_config_file_rb,v 1.5 2012/04/27 18:41:07 jeremy Exp $
+--- lib/rubygems/config_file.rb.orig	Thu Apr 19 21:29:58 2012
++++ lib/rubygems/config_file.rb	Mon Apr 23 12:50:57 2012
+@@ -70,7 +70,7 @@ class Gem::ConfigFile
  
          path.strip
        rescue LoadError
--        "/etc"
-+        '${SYSCONFDIR}'
+-        RbConfig::CONFIG["sysconfdir"] || "/etc"
++        RbConfig::CONFIG["sysconfdir"] || '${SYSCONFDIR}'
        end
      end
  
diff --git a/devel/ruby-gems/pkg/PLIST b/devel/ruby-gems/pkg/PLIST
index ee2651b1cdc..4f82cbacb4e 100644
--- a/devel/ruby-gems/pkg/PLIST
+++ b/devel/ruby-gems/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.11 2011/11/08 23:44:12 jeremy Exp $
+@comment $OpenBSD: PLIST,v 1.12 2012/04/27 18:41:07 jeremy Exp $
 bin/gem18
 lib/ruby/gems/
 lib/ruby/gems/${MODRUBY_LIBREV}/
@@ -86,6 +86,8 @@ ${MODRUBY_SITEDIR}/rubygems/package/tar_writer.rb
 ${MODRUBY_SITEDIR}/rubygems/package_task.rb
 ${MODRUBY_SITEDIR}/rubygems/path_support.rb
 ${MODRUBY_SITEDIR}/rubygems/platform.rb
+${MODRUBY_SITEDIR}/rubygems/psych_additions.rb
+${MODRUBY_SITEDIR}/rubygems/psych_tree.rb
 ${MODRUBY_SITEDIR}/rubygems/remote_fetcher.rb
 ${MODRUBY_SITEDIR}/rubygems/require_paths_builder.rb
 ${MODRUBY_SITEDIR}/rubygems/requirement.rb
@@ -94,6 +96,7 @@ ${MODRUBY_SITEDIR}/rubygems/server.rb
 ${MODRUBY_SITEDIR}/rubygems/source_index.rb
 ${MODRUBY_SITEDIR}/rubygems/spec_fetcher.rb
 ${MODRUBY_SITEDIR}/rubygems/specification.rb
+${MODRUBY_SITEDIR}/rubygems/syck_hack.rb
 ${MODRUBY_SITEDIR}/rubygems/test_case.rb
 ${MODRUBY_SITEDIR}/rubygems/test_utilities.rb
 ${MODRUBY_SITEDIR}/rubygems/text.rb