diff --git a/audio/ruby-id3lib/Makefile b/audio/ruby-id3lib/Makefile
index a9ed8cd64ec..ec8de211d29 100644
--- a/audio/ruby-id3lib/Makefile
+++ b/audio/ruby-id3lib/Makefile
@@ -1,11 +1,10 @@
-# $OpenBSD: Makefile,v 1.15 2011/01/06 04:24:22 jeremy Exp $
+# $OpenBSD: Makefile,v 1.16 2011/05/06 16:05:12 jeremy Exp $
 
 COMMENT=	Ruby interface to the id3lib C++ library
 
-VERSION=	0.5.0
+VERSION=	0.6.0
 DISTNAME=	id3lib-ruby-${VERSION}
 PKGNAME=	id3lib-${VERSION}
-REVISION=	6
 CATEGORIES=	audio
 
 MAINTAINER=	Paul Irofti <pirofti@openbsd.org>
@@ -16,7 +15,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MODULES=	lang/ruby
+MODULES=	lang/ruby converters/libiconv
 WANTLIB=	id3>=4 stdc++ z
 LIB_DEPENDS=	audio/id3lib
 
diff --git a/audio/ruby-id3lib/distinfo b/audio/ruby-id3lib/distinfo
index c80d18d7600..2d3d731b2a3 100644
--- a/audio/ruby-id3lib/distinfo
+++ b/audio/ruby-id3lib/distinfo
@@ -1,5 +1,5 @@
-MD5 (id3lib-ruby-0.5.0.gem) = j/zUjIhnedBhN+iDmqlK/w==
-RMD160 (id3lib-ruby-0.5.0.gem) = tb7M5NrnaYPTWIA0wxI1/SDTTS4=
-SHA1 (id3lib-ruby-0.5.0.gem) = t11Kifp8/QoVWaKcwkD2kLf95zo=
-SHA256 (id3lib-ruby-0.5.0.gem) = 4mz3RxAlQjIKqiv/zwXk6jaIS75Pukh0nPsH9fFG0es=
-SIZE (id3lib-ruby-0.5.0.gem) = 90112
+MD5 (id3lib-ruby-0.6.0.gem) = YHaE2+IJnW2z/SsD+jCwCA==
+RMD160 (id3lib-ruby-0.6.0.gem) = +LoK+cHKGwI3Zrq54IoqLF9SqEo=
+SHA1 (id3lib-ruby-0.6.0.gem) = 4Q7NGvlEu30AQs6qADP/OFlzHK4=
+SHA256 (id3lib-ruby-0.6.0.gem) = zWFKwdLN+G65MbC0Q13Q/vR/Ym4K79wstdDYpbfHkFw=
+SIZE (id3lib-ruby-0.6.0.gem) = 94208
diff --git a/audio/ruby-id3lib/patches/patch-Rakefile b/audio/ruby-id3lib/patches/patch-Rakefile
index cb8d49af580..66f64acd58a 100644
--- a/audio/ruby-id3lib/patches/patch-Rakefile
+++ b/audio/ruby-id3lib/patches/patch-Rakefile
@@ -1,20 +1,11 @@
-$OpenBSD: patch-Rakefile,v 1.1.1.1 2008/02/09 11:31:54 bernd Exp $
---- Rakefile.orig	Thu Jan  1 01:00:00 1970
-+++ Rakefile	Sat Feb  9 12:20:26 2008
-@@ -48,6 +48,7 @@ Rake::TestTask.new do |t|
-   t.libs = ['lib', 'ext']
+$OpenBSD: patch-Rakefile,v 1.2 2011/05/06 16:05:12 jeremy Exp $
+--- Rakefile.orig	Wed Dec 31 16:00:00 1969
++++ Rakefile	Wed Mar 23 14:29:22 2011
+@@ -40,6 +40,7 @@ Rake::TestTask.new do |t|
+   t.libs = ['lib', 'ext/id3lib_api']
    t.test_files = FileList['test/test_*.rb']
    t.verbose = true
 +  t.ruby_opts = ['-rubygems']
  end
  
  
-@@ -93,7 +94,7 @@ if defined? Gem
-   spec_mswin32.files = FILES_COMMON + FileList['ext/mswin32/id3lib_api.so']
-   spec_mswin32.extensions = []
-   spec_mswin32.require_paths = ['lib', 'ext/mswin32']
--  spec_mswin32.platform = Gem::Platform::WIN32
-+  spec_mswin32.platform = Gem::Platform::CURRENT
- 
-   desc "Build mswin32 gem."
-   task :gem_mswin32 => [:ext_mswin32] do
diff --git a/audio/ruby-id3lib/pkg/PLIST b/audio/ruby-id3lib/pkg/PLIST
index 27d8aa53b2e..2a27fd91476 100644
--- a/audio/ruby-id3lib/pkg/PLIST
+++ b/audio/ruby-id3lib/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.2 2010/11/08 23:24:39 jeremy Exp $
+@comment $OpenBSD: PLIST,v 1.3 2011/05/06 16:05:12 jeremy Exp $
 ${GEM_LIB}/cache/${DISTNAME}.gem
 ${GEM_LIB}/gems/${DISTNAME}/
 ${GEM_LIB}/gems/${DISTNAME}/CHANGES
@@ -7,15 +7,15 @@ ${GEM_LIB}/gems/${DISTNAME}/README
 ${GEM_LIB}/gems/${DISTNAME}/Rakefile
 ${GEM_LIB}/gems/${DISTNAME}/TODO
 ${GEM_LIB}/gems/${DISTNAME}/ext/
-${GEM_LIB}/gems/${DISTNAME}/ext/Makefile
-${GEM_LIB}/gems/${DISTNAME}/ext/Rakefile
-${GEM_LIB}/gems/${DISTNAME}/ext/extconf.rb
-${GEM_LIB}/gems/${DISTNAME}/ext/generate_info.rb
-${GEM_LIB}/gems/${DISTNAME}/ext/id3lib_api.i
-${GEM_LIB}/gems/${DISTNAME}/ext/id3lib_api.so
-${GEM_LIB}/gems/${DISTNAME}/ext/id3lib_api_wrap.cxx
-${GEM_LIB}/gems/${DISTNAME}/ext/id3lib_api_wrap.o
-${GEM_LIB}/gems/${DISTNAME}/ext/mkmf.log
+${GEM_LIB}/gems/${DISTNAME}/ext/id3lib_api/
+${GEM_LIB}/gems/${DISTNAME}/ext/id3lib_api/Makefile
+${GEM_LIB}/gems/${DISTNAME}/ext/id3lib_api/Rakefile
+${GEM_LIB}/gems/${DISTNAME}/ext/id3lib_api/extconf.rb
+${GEM_LIB}/gems/${DISTNAME}/ext/id3lib_api/id3lib_api.i
+${GEM_LIB}/gems/${DISTNAME}/ext/id3lib_api/id3lib_api.so
+${GEM_LIB}/gems/${DISTNAME}/ext/id3lib_api/id3lib_api_wrap.cxx
+${GEM_LIB}/gems/${DISTNAME}/ext/id3lib_api/id3lib_api_wrap.o
+${GEM_LIB}/gems/${DISTNAME}/ext/id3lib_api/mkmf.log
 ${GEM_LIB}/gems/${DISTNAME}/lib/
 ${GEM_LIB}/gems/${DISTNAME}/lib/id3lib/
 ${GEM_LIB}/gems/${DISTNAME}/lib/id3lib.rb