diff --git a/devel/ruby-pkg-config/DESCR b/devel/ruby-pkg-config/DESCR
index cf4d2df781538..2fb588f0a3266 100644
--- a/devel/ruby-pkg-config/DESCR
+++ b/devel/ruby-pkg-config/DESCR
@@ -1 +1,2 @@
-A pkg-config implementation by Ruby.
+pkg-config can be used in your extconf.rb to properly detect need libraries for
+compiling Ruby native extensions.
diff --git a/devel/ruby-pkg-config/Makefile b/devel/ruby-pkg-config/Makefile
index 2cb00d34ac579..1f13e830678f4 100644
--- a/devel/ruby-pkg-config/Makefile
+++ b/devel/ruby-pkg-config/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2011/05/03 09:49:03 obache Exp $
+# $NetBSD: Makefile,v 1.6 2012/02/01 12:32:12 obache Exp $
 
-DISTNAME=	pkg-config-1.1.1
+DISTNAME=	pkg-config-1.1.3
 CATEGORIES=	devel
-MASTER_SITES=	http://rubyforge.org/frs/download.php/74790/
-EXTRACT_SUFX=	.tgz
+MASTER_SITES=	http://rubygems.org/gems/ \
+		http://gems.rubyforge.org/gems/
+EXTRACT_SUFX=	.gem
 
 MAINTAINER=	obache@NetBSD.org
 HOMEPAGE=	http://github.com/rcairo/pkg-config
@@ -14,7 +15,16 @@ CONFLICTS+=	${RUBY_PKGPREFIX}-gnome2-glib<0.90.0
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-USE_RUBY_EXTCONF=	yes
+USE_RUBY_SETUP=		yes
+
+SUBST_CLASSES+=		vsetup
+SUBST_STAGE.vsetup=	pre-configure
+SUBST_FILES.vsetup=	setup.rb
+SUBST_SED.vsetup=	-e "s|'sitedir'|'vendordir'|g"
+SUBST_SED.vsetup+=	-e "s|'sitelibdir'|'vendorlibdir'|g"
+SUBST_SED.vsetup+=	-e 's|"sitelibdir"|"vendorlibdir"|g'
+SUBST_SED.vsetup+=	-e 's|/site_ruby/|/vendor_ruby/|g'
+SUBST_MESSAGE.vsetup=	Fixing setup.rb to use `vendor'.
 
 #do-test:
 #		cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ${RUBY} test/run-test.rb
diff --git a/devel/ruby-pkg-config/distinfo b/devel/ruby-pkg-config/distinfo
index c70aa2caba468..6a6fcada32faf 100644
--- a/devel/ruby-pkg-config/distinfo
+++ b/devel/ruby-pkg-config/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2011/05/03 09:49:03 obache Exp $
+$NetBSD: distinfo,v 1.6 2012/02/01 12:32:12 obache Exp $
 
-SHA1 (pkg-config-1.1.1.tgz) = b29f9325dc89d1ae9aed4485bb167913918dcc5c
-RMD160 (pkg-config-1.1.1.tgz) = 5edebae36ee642cc33e773a087a84595d60ba168
-Size (pkg-config-1.1.1.tgz) = 15156 bytes
+SHA1 (pkg-config-1.1.3.gem) = ff98fb494edb7f032d9aaef8d1af8281f698a1ec
+RMD160 (pkg-config-1.1.3.gem) = 965e75f93dba9ef0c746fc1b65432ce459104883
+Size (pkg-config-1.1.3.gem) = 27648 bytes