diff --git a/textproc/ruby-csv/Makefile b/textproc/ruby-csv/Makefile
index e1c22413eb38..dae452cb8fc4 100644
--- a/textproc/ruby-csv/Makefile
+++ b/textproc/ruby-csv/Makefile
@@ -1,33 +1,29 @@
 # New ports collection makefile for:	ruby-csv
 # Date created:		18 Feb 2001
 # Whom:			Yarema <yds@dppl.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	csv
-PORTVERSION=	1.0.2
+PORTVERSION=	1.1.0
 CATEGORIES=	textproc ruby
 MASTER_SITES=	http://www.jin.gr.jp/~nahi/Ruby/CSV/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/./_/g}
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
 
 USE_RUBY=	yes
 
 NO_BUILD=	yes
 
-MODULES=	csv.rb
-
 do-install:
-.for f in ${MODULES}
-	${INSTALL_DATA} ${WRKSRC}/lib/${f} ${RUBY_SITELIBDIR}
-.endfor
+	cd ${WRKSRC}; ${RUBY} install.rb
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_DOCDIR}/csv
-	${INSTALL_DATA} ${WRKSRC}/README.txt ${RUBY_DOCDIR}/csv
+	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}
+	${INSTALL_DATA} ${WRKSRC}/README.txt ${RUBY_DOCDIR}/${PORTNAME}
 .endif
 
 .include <bsd.port.mk>
diff --git a/textproc/ruby-csv/distinfo b/textproc/ruby-csv/distinfo
index eed7e841b043..07aa569189eb 100644
--- a/textproc/ruby-csv/distinfo
+++ b/textproc/ruby-csv/distinfo
@@ -1 +1 @@
-MD5 (ruby/csv-1_0_2.tar.gz) = f096651114e2b8c2e1a0b627eb5d1bce
+MD5 (ruby/csv-1_1_0.tar.gz) = 954ab76ffa15b042633b35f537fcc58e