diff --git a/databases/ruby-rdbc1/Makefile b/databases/ruby-rdbc1/Makefile
index d4e3a0f317f7..9800819ae95a 100644
--- a/databases/ruby-rdbc1/Makefile
+++ b/databases/ruby-rdbc1/Makefile
@@ -3,13 +3,12 @@
 
 PORTNAME=	rdbc1
 PORTVERSION=	001103
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	databases ruby
 MASTER_SITES=	http://homepage3.nifty.com/guion/SOFT/RDBC/ \
 		ftp://ftp.dinoex.de/pub/approved/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	${PORTNAME}_${PORTVERSION}
-EXTRACT_SUFX=	.tgz
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	ruby@FreeBSD.org
@@ -18,25 +17,22 @@ COMMENT=	Ruby Database Connectivity
 RUN_DEPENDS=	rubygem-pg>=0:${PORTSDIR}/databases/rubygem-pg
 
 USE_RUBY=	yes
+USES=		dos2unix tar:tgz
+
+DOS2UNIX_FILES=	ora_rdbc1.rb pg_rdbc1.rb rdbc1.rb sample/test1.rb
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_BUILD=	yes
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
-.include <bsd.port.options.mk>
-
 do-install:
 	${MKDIR} ${STAGEDIR}${RUBY_SITELIBDIR}
 	${INSTALL_DATA} ${WRKSRC}/*.rb ${STAGEDIR}${RUBY_SITELIBDIR}/
-.if ${PORT_OPTIONS:MEXAMPLES}
+	${MKDIR} ${STAGEDIR}${RUBY_MODDOCDIR}/ja
+	cd ${WRKSRC}/doc/en/ && ${COPYTREE_SHARE} . ${STAGEDIR}${RUBY_MODDOCDIR}/
+	cd ${WRKSRC}/doc/ja/ && ${COPYTREE_SHARE} . ${STAGEDIR}${RUBY_MODDOCDIR}/ja/
 	${MKDIR} ${STAGEDIR}${RUBY_MODEXAMPLESDIR}/
 	${INSTALL_DATA} ${WRKSRC}/sample/*.rb ${STAGEDIR}${RUBY_MODEXAMPLESDIR}/
-.endif
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${STAGEDIR}${RUBY_MODDOCDIR}/ja
-	${CP} -R ${WRKSRC}/doc/en/* ${STAGEDIR}${RUBY_MODDOCDIR}/
-	${CP} -R ${WRKSRC}/doc/ja/* ${STAGEDIR}${RUBY_MODDOCDIR}/ja/
-.endif
 
 .include <bsd.port.mk>
diff --git a/databases/ruby-rdbc1/files/patch-pg_rdbc1.rb b/databases/ruby-rdbc1/files/patch-pg_rdbc1.rb
index 57fd49883769..9342e93e8f34 100644
--- a/databases/ruby-rdbc1/files/patch-pg_rdbc1.rb
+++ b/databases/ruby-rdbc1/files/patch-pg_rdbc1.rb
@@ -1,11 +1,11 @@
 --- pg_rdbc1.rb.orig	Fri May 26 03:24:12 2000
 +++ pg_rdbc1.rb	Mon Mar 19 17:44:34 2001
 @@ -11,7 +11,7 @@
- require "rdbc1.rb"
- 
- module PG_RDBC1
--  require "../postgres/postgres.so"
-+  require "postgres"
-   include RDBC1
- 
-   # Driver Creator will inherite me.
+ require "rdbc1.rb"
+ 
+ module PG_RDBC1
+-  require "../postgres/postgres.so"
++  require "postgres"
+   include RDBC1
+ 
+   # Driver Creator will inherite me.