diff --git a/databases/ruby-postgres/Makefile b/databases/ruby-postgres/Makefile
index 85f6ff2ed696..1901405a3808 100644
--- a/databases/ruby-postgres/Makefile
+++ b/databases/ruby-postgres/Makefile
@@ -5,25 +5,20 @@
 # $FreeBSD$
 #
 
-PORTNAME=	ruby-postgres
-PORTVERSION=	0.5.3
+PORTNAME=	postgres
+PORTVERSION=	0.6.1
 CATEGORIES=	databases
-MASTER_SITES=	ftp://ftp.netlab.co.jp/pub/lang/ruby/contrib/ \
-		ftp://ftp.TokyoNet.AD.JP/pub/misc/ruby/contrib/ \
-		ftp://ftp.iij.ad.jp/pub/lang/ruby/contrib/ \
-		ftp://blade.nagaokaut.ac.jp/pub/lang/ruby/contrib/ \
-		ftp://ftp.krnet.ne.jp/pub/ruby/contrib/ \
-		ftp://mirror.nucba.ac.jp/mirror/ruby/contrib/
-DISTNAME=	postgres-${PORTVERSION}
+MASTER_SITES=	http://webclub.kcom.ne.jp/mb/noborus/archive/
+PKGNAMEPREFIX=	ruby-
 DIST_SUBDIR=	ruby
 
-MAINTAINER=	yasuf@big.or.jp
+MAINTAINER=	knu@FreeBSD.org
 
 BUILD_DEPENDS=	ruby:${PORTSDIR}/lang/ruby
 RUN_DEPENDS=	ruby:${PORTSDIR}/lang/ruby
-LIB_DEPENDS=	pq.2:${PORTSDIR}/databases/postgresql
+LIB_DEPENDS=	pq.2:${PORTSDIR}/databases/postgresql7
 
-WRKSRC=		${WRKDIR}/postgres
+WRKSRC=		${WRKDIR}/${PORTNAME}
 CONFIGURE_ARGS+= --with-pgsql-include-dir="${PGDIR}/include" \
 		--with-pgsql-lib-dir="${PGDIR}/lib"
 PLIST_SUB+=	RUBY_VER="${RUBY_VER}" RUBY_ARCH="${RUBY_ARCH}"
@@ -34,15 +29,23 @@ RUBY_ARCH=	${ARCH}-freebsd${OSREL}
 
 PGDIR?=		${PREFIX}/pgsql
 
+DOCS_EN=	ChangeLog README doc/postgres.html
+DOCS_JA=	README.jp doc/postgres.jp.html
+
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${RUBY} extconf.rb ${CONFIGURE_ARGS}
 
 post-install:
 	${MKDIR} ${PREFIX}/share/examples/ruby/postgres
-	${INSTALL_DATA} ${WRKSRC}/psql*.rb ${PREFIX}/share/examples/ruby/postgres
+	${INSTALL_DATA} ${WRKSRC}/sample/* ${PREFIX}/share/examples/ruby/postgres/
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/ruby/postgres
-	${INSTALL_DATA} ${WRKSRC}/README* ${WRKSRC}/*.html ${PREFIX}/share/doc/ruby/postgres
+	${MKDIR} ${PREFIX}/share/doc/ruby/postgres/ja
+.for f in ${DOCS_EN}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/ruby/postgres/
+.endfor
+.for f in ${DOCS_JA}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/ruby/postgres/ja/
+.endfor
 .endif
 
 .include <bsd.port.mk>
diff --git a/databases/ruby-postgres/distinfo b/databases/ruby-postgres/distinfo
index 6d742d453095..6f6f19ad6f62 100644
--- a/databases/ruby-postgres/distinfo
+++ b/databases/ruby-postgres/distinfo
@@ -1 +1 @@
-MD5 (ruby/postgres-0.5.3.tar.gz) = f34965e627807b9e9ac78e322e3d21f2
+MD5 (ruby/postgres-0.6.1.tar.gz) = 12620ad063d9a36da7faff66dace3799
diff --git a/databases/ruby-postgres/pkg-descr b/databases/ruby-postgres/pkg-descr
index 8fac5ce62d1d..b16cc402eb53 100644
--- a/databases/ruby-postgres/pkg-descr
+++ b/databases/ruby-postgres/pkg-descr
@@ -1,4 +1,4 @@
 This is an extention module to access PostgreSQL database from Ruby.
+This library works with PostgreSQL 6.4/6.5 and 7.0.
 
-- Yasuhiro Fukuma
-yasuf@big.or.jp
+WWW:	http://webclub.kcom.ne.jp/mb/noborus/postgres/index.html
diff --git a/databases/ruby-postgres/pkg-plist b/databases/ruby-postgres/pkg-plist
index a585c96db95a..1c2ff3302e4e 100644
--- a/databases/ruby-postgres/pkg-plist
+++ b/databases/ruby-postgres/pkg-plist
@@ -1,10 +1,15 @@
 lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/postgres.so
+share/examples/ruby/postgres/losample.rb
 share/examples/ruby/postgres/psql.rb
 share/examples/ruby/postgres/psqlHelp.rb
+share/examples/ruby/postgres/test1.rb
+share/examples/ruby/postgres/test2.rb
+share/examples/ruby/postgres/test4.rb
 @dirrm share/examples/ruby/postgres
+share/doc/ruby/postgres/ChangeLog
 share/doc/ruby/postgres/README
-share/doc/ruby/postgres/README.jp
 share/doc/ruby/postgres/postgres.html
-share/doc/ruby/postgres/postgres.jp.html
+share/doc/ruby/postgres/ja/README.jp
+share/doc/ruby/postgres/ja/postgres.jp.html
+@dirrm share/doc/ruby/postgres/ja
 @dirrm share/doc/ruby/postgres
-@unexec /bin/rmdir %D/share/doc/ruby >/dev/null 2>&1 || true
diff --git a/databases/rubygem-postgres/Makefile b/databases/rubygem-postgres/Makefile
index 85f6ff2ed696..1901405a3808 100644
--- a/databases/rubygem-postgres/Makefile
+++ b/databases/rubygem-postgres/Makefile
@@ -5,25 +5,20 @@
 # $FreeBSD$
 #
 
-PORTNAME=	ruby-postgres
-PORTVERSION=	0.5.3
+PORTNAME=	postgres
+PORTVERSION=	0.6.1
 CATEGORIES=	databases
-MASTER_SITES=	ftp://ftp.netlab.co.jp/pub/lang/ruby/contrib/ \
-		ftp://ftp.TokyoNet.AD.JP/pub/misc/ruby/contrib/ \
-		ftp://ftp.iij.ad.jp/pub/lang/ruby/contrib/ \
-		ftp://blade.nagaokaut.ac.jp/pub/lang/ruby/contrib/ \
-		ftp://ftp.krnet.ne.jp/pub/ruby/contrib/ \
-		ftp://mirror.nucba.ac.jp/mirror/ruby/contrib/
-DISTNAME=	postgres-${PORTVERSION}
+MASTER_SITES=	http://webclub.kcom.ne.jp/mb/noborus/archive/
+PKGNAMEPREFIX=	ruby-
 DIST_SUBDIR=	ruby
 
-MAINTAINER=	yasuf@big.or.jp
+MAINTAINER=	knu@FreeBSD.org
 
 BUILD_DEPENDS=	ruby:${PORTSDIR}/lang/ruby
 RUN_DEPENDS=	ruby:${PORTSDIR}/lang/ruby
-LIB_DEPENDS=	pq.2:${PORTSDIR}/databases/postgresql
+LIB_DEPENDS=	pq.2:${PORTSDIR}/databases/postgresql7
 
-WRKSRC=		${WRKDIR}/postgres
+WRKSRC=		${WRKDIR}/${PORTNAME}
 CONFIGURE_ARGS+= --with-pgsql-include-dir="${PGDIR}/include" \
 		--with-pgsql-lib-dir="${PGDIR}/lib"
 PLIST_SUB+=	RUBY_VER="${RUBY_VER}" RUBY_ARCH="${RUBY_ARCH}"
@@ -34,15 +29,23 @@ RUBY_ARCH=	${ARCH}-freebsd${OSREL}
 
 PGDIR?=		${PREFIX}/pgsql
 
+DOCS_EN=	ChangeLog README doc/postgres.html
+DOCS_JA=	README.jp doc/postgres.jp.html
+
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${RUBY} extconf.rb ${CONFIGURE_ARGS}
 
 post-install:
 	${MKDIR} ${PREFIX}/share/examples/ruby/postgres
-	${INSTALL_DATA} ${WRKSRC}/psql*.rb ${PREFIX}/share/examples/ruby/postgres
+	${INSTALL_DATA} ${WRKSRC}/sample/* ${PREFIX}/share/examples/ruby/postgres/
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/ruby/postgres
-	${INSTALL_DATA} ${WRKSRC}/README* ${WRKSRC}/*.html ${PREFIX}/share/doc/ruby/postgres
+	${MKDIR} ${PREFIX}/share/doc/ruby/postgres/ja
+.for f in ${DOCS_EN}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/ruby/postgres/
+.endfor
+.for f in ${DOCS_JA}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/ruby/postgres/ja/
+.endfor
 .endif
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-postgres/distinfo b/databases/rubygem-postgres/distinfo
index 6d742d453095..6f6f19ad6f62 100644
--- a/databases/rubygem-postgres/distinfo
+++ b/databases/rubygem-postgres/distinfo
@@ -1 +1 @@
-MD5 (ruby/postgres-0.5.3.tar.gz) = f34965e627807b9e9ac78e322e3d21f2
+MD5 (ruby/postgres-0.6.1.tar.gz) = 12620ad063d9a36da7faff66dace3799
diff --git a/databases/rubygem-postgres/pkg-descr b/databases/rubygem-postgres/pkg-descr
index 8fac5ce62d1d..b16cc402eb53 100644
--- a/databases/rubygem-postgres/pkg-descr
+++ b/databases/rubygem-postgres/pkg-descr
@@ -1,4 +1,4 @@
 This is an extention module to access PostgreSQL database from Ruby.
+This library works with PostgreSQL 6.4/6.5 and 7.0.
 
-- Yasuhiro Fukuma
-yasuf@big.or.jp
+WWW:	http://webclub.kcom.ne.jp/mb/noborus/postgres/index.html
diff --git a/databases/rubygem-postgres/pkg-plist b/databases/rubygem-postgres/pkg-plist
index a585c96db95a..1c2ff3302e4e 100644
--- a/databases/rubygem-postgres/pkg-plist
+++ b/databases/rubygem-postgres/pkg-plist
@@ -1,10 +1,15 @@
 lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/postgres.so
+share/examples/ruby/postgres/losample.rb
 share/examples/ruby/postgres/psql.rb
 share/examples/ruby/postgres/psqlHelp.rb
+share/examples/ruby/postgres/test1.rb
+share/examples/ruby/postgres/test2.rb
+share/examples/ruby/postgres/test4.rb
 @dirrm share/examples/ruby/postgres
+share/doc/ruby/postgres/ChangeLog
 share/doc/ruby/postgres/README
-share/doc/ruby/postgres/README.jp
 share/doc/ruby/postgres/postgres.html
-share/doc/ruby/postgres/postgres.jp.html
+share/doc/ruby/postgres/ja/README.jp
+share/doc/ruby/postgres/ja/postgres.jp.html
+@dirrm share/doc/ruby/postgres/ja
 @dirrm share/doc/ruby/postgres
-@unexec /bin/rmdir %D/share/doc/ruby >/dev/null 2>&1 || true