diff --git a/converters/ruby-json/Makefile b/converters/ruby-json/Makefile
index 98e0c089c4f..11af5981d28 100644
--- a/converters/ruby-json/Makefile
+++ b/converters/ruby-json/Makefile
@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.13 2011/03/25 16:39:54 jeremy Exp $
+# $OpenBSD: Makefile,v 1.14 2011/06/02 00:13:41 jeremy Exp $
 
 COMMENT=		JSON implementation for Ruby
 
-DISTNAME=		json-1.4.6
-REVISION =		1
+DISTNAME=		json-1.5.1
 CATEGORIES=		converters
 
 HOMEPAGE=		http://json.rubyforge.org/
@@ -19,7 +18,8 @@ MODULES=		lang/ruby
 CONFIGURE_STYLE=	ruby gem ext
 
 MODRUBY_REGRESS=	rake
-REGRESS_DEPENDS =	${FULLPKGNAME}:${BUILD_PKGPATH}
+REGRESS_DEPENDS =	${FULLPKGNAME}:${BUILD_PKGPATH} \
+			${MODRUBY_ICONV_DEPENDS}
 
 do-regress:
 	cd ${WRKSRC} && /usr/bin/env -i ${MAKE_ENV} RUBYOPT=-rubygems \
diff --git a/converters/ruby-json/distinfo b/converters/ruby-json/distinfo
index 81f5d1794ae..e767593f9d6 100644
--- a/converters/ruby-json/distinfo
+++ b/converters/ruby-json/distinfo
@@ -1,5 +1,5 @@
-MD5 (json-1.4.6.gem) = EKkjwcAxxV0rrIYWZEMTAQ==
-RMD160 (json-1.4.6.gem) = vVc25oXTR+d00aiAD2Cooh9Z2i0=
-SHA1 (json-1.4.6.gem) = pQrM7pGAWlfrX0YTBz7etCIEPFc=
-SHA256 (json-1.4.6.gem) = 0yQaFBxtpZY+Wb91qR2DLRPn7GeTuOSEZTlSFqHhfsU=
-SIZE (json-1.4.6.gem) = 398848
+MD5 (json-1.5.1.gem) = lbQ/QpSSG+kVA/ZvzVPi/A==
+RMD160 (json-1.5.1.gem) = PSdCFhbDzCCH9zjDPQyuwlHKgQk=
+SHA1 (json-1.5.1.gem) = W+SqJ8c7mgxhWbR/5YtqvI8QCpM=
+SHA256 (json-1.5.1.gem) = 1jGdxSE8ESl+VEHRvyBOFRcDawaAtDc6ftpPG6M0BO0=
+SIZE (json-1.5.1.gem) = 669696
diff --git a/converters/ruby-json/pkg/PLIST b/converters/ruby-json/pkg/PLIST
index 6d35a60f45d..84db8ce8dd6 100644
--- a/converters/ruby-json/pkg/PLIST
+++ b/converters/ruby-json/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.5 2010/11/08 23:31:59 jeremy Exp $
+@comment $OpenBSD: PLIST,v 1.6 2011/06/02 00:13:41 jeremy Exp $
 ${GEM_BIN}/edit_json.rb${GEM_BIN_SUFFIX}
 ${GEM_BIN}/prettify_json.rb${GEM_BIN_SUFFIX}
 ${GEM_LIB}/cache/${DISTNAME}.gem
@@ -6,8 +6,10 @@ ${GEM_LIB}/gems/${DISTNAME}/
 ${GEM_LIB}/gems/${DISTNAME}/.require_paths
 ${GEM_LIB}/gems/${DISTNAME}/CHANGES
 ${GEM_LIB}/gems/${DISTNAME}/COPYING
+${GEM_LIB}/gems/${DISTNAME}/COPYING-json-jruby
 ${GEM_LIB}/gems/${DISTNAME}/GPL
 ${GEM_LIB}/gems/${DISTNAME}/README
+${GEM_LIB}/gems/${DISTNAME}/README-json-jruby.markdown
 ${GEM_LIB}/gems/${DISTNAME}/Rakefile
 ${GEM_LIB}/gems/${DISTNAME}/TODO
 ${GEM_LIB}/gems/${DISTNAME}/VERSION
@@ -82,6 +84,27 @@ ${GEM_LIB}/gems/${DISTNAME}/ext/json/ext/parser/parser.o
 ${GEM_LIB}/gems/${DISTNAME}/ext/json/ext/parser/parser.rl
 ${GEM_LIB}/gems/${DISTNAME}/ext/json/ext/parser/parser.so
 ${GEM_LIB}/gems/${DISTNAME}/install.rb
+${GEM_LIB}/gems/${DISTNAME}/java/
+${GEM_LIB}/gems/${DISTNAME}/java/lib/
+${GEM_LIB}/gems/${DISTNAME}/java/lib/bytelist-1.0.6.jar
+${GEM_LIB}/gems/${DISTNAME}/java/lib/jcodings.jar
+${GEM_LIB}/gems/${DISTNAME}/java/src/
+${GEM_LIB}/gems/${DISTNAME}/java/src/json/
+${GEM_LIB}/gems/${DISTNAME}/java/src/json/ext/
+${GEM_LIB}/gems/${DISTNAME}/java/src/json/ext/ByteListTranscoder.java
+${GEM_LIB}/gems/${DISTNAME}/java/src/json/ext/Generator.java
+${GEM_LIB}/gems/${DISTNAME}/java/src/json/ext/GeneratorMethods.java
+${GEM_LIB}/gems/${DISTNAME}/java/src/json/ext/GeneratorService.java
+${GEM_LIB}/gems/${DISTNAME}/java/src/json/ext/GeneratorState.java
+${GEM_LIB}/gems/${DISTNAME}/java/src/json/ext/OptionsReader.java
+${GEM_LIB}/gems/${DISTNAME}/java/src/json/ext/Parser.java
+${GEM_LIB}/gems/${DISTNAME}/java/src/json/ext/Parser.rl
+${GEM_LIB}/gems/${DISTNAME}/java/src/json/ext/ParserService.java
+${GEM_LIB}/gems/${DISTNAME}/java/src/json/ext/RuntimeInfo.java
+${GEM_LIB}/gems/${DISTNAME}/java/src/json/ext/StringDecoder.java
+${GEM_LIB}/gems/${DISTNAME}/java/src/json/ext/StringEncoder.java
+${GEM_LIB}/gems/${DISTNAME}/java/src/json/ext/Utils.java
+${GEM_LIB}/gems/${DISTNAME}/json-java.gemspec
 ${GEM_LIB}/gems/${DISTNAME}/lib/
 ${GEM_LIB}/gems/${DISTNAME}/lib/json/
 ${GEM_LIB}/gems/${DISTNAME}/lib/json.rb
@@ -138,12 +161,13 @@ ${GEM_LIB}/gems/${DISTNAME}/tests/fixtures/pass17.json
 ${GEM_LIB}/gems/${DISTNAME}/tests/fixtures/pass2.json
 ${GEM_LIB}/gems/${DISTNAME}/tests/fixtures/pass26.json
 ${GEM_LIB}/gems/${DISTNAME}/tests/fixtures/pass3.json
+${GEM_LIB}/gems/${DISTNAME}/tests/setup_variant.rb
 ${GEM_LIB}/gems/${DISTNAME}/tests/test_json.rb
 ${GEM_LIB}/gems/${DISTNAME}/tests/test_json_addition.rb
 ${GEM_LIB}/gems/${DISTNAME}/tests/test_json_encoding.rb
 ${GEM_LIB}/gems/${DISTNAME}/tests/test_json_fixtures.rb
 ${GEM_LIB}/gems/${DISTNAME}/tests/test_json_generate.rb
-${GEM_LIB}/gems/${DISTNAME}/tests/test_json_rails.rb
+${GEM_LIB}/gems/${DISTNAME}/tests/test_json_string_matching.rb
 ${GEM_LIB}/gems/${DISTNAME}/tests/test_json_unicode.rb
 ${GEM_LIB}/gems/${DISTNAME}/tools/
 ${GEM_LIB}/gems/${DISTNAME}/tools/fuzz.rb