diff --git a/devel/ruby-amstd/Makefile b/devel/ruby-amstd/Makefile
index 0217672b73d5..75dbd83e76d9 100644
--- a/devel/ruby-amstd/Makefile
+++ b/devel/ruby-amstd/Makefile
@@ -6,56 +6,28 @@
 #
 
 PORTNAME=	amstd
-PORTVERSION=	1.9.6
+PORTVERSION=	1.10.0
 CATEGORIES=	devel ruby
-MASTER_SITES=	http://www.xdsl.ne.jp/Cd/aamine/soft/
+MASTER_SITES=	http://www.loveruby.net/archive/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
 
 USE_RUBY=	yes
-
-NO_BUILD=	yes
+USE_RUBY_SETUP=	yes
 
 DOCS_EN=	README.en
 DOCS_JA=	README.ja amstd-ja.rd
-MODULES=	bench.rb \
-		bug.rb \
-		collfrom.rb \
-		constdef.rb \
-		dispatch.rb \
-		errutil.rb \
-		extmod.rb \
-		fileutils.rb \
-		futils.rb \
-		gconst.rb \
-		getdep.rb \
-		info.rb \
-		must.rb \
-		pipeline.rb \
-		rbparams.rb \
-		recycle.rb \
-		rubyemu.rb \
-		strquote.rb \
-		symbol.rb \
-		timer.rb \
-		to_s.rb \
-		version.rb
 
-do-install:
-	${MKDIR} ${RUBY_SITELIBDIR}/amstd
-.for f in ${MODULES}
-	${INSTALL_DATA} ${WRKSRC}/lib/amstd/${f} \
-			${RUBY_SITELIBDIR}/amstd/
-.endfor
+post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_DOCDIR}/amstd/ja
+	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}/ja
 .for f in ${DOCS_EN}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/amstd/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${PORTNAME}/
 .endfor
 .for f in ${DOCS_JA}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/amstd/ja/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${PORTNAME}/ja/
 .endfor
 .endif
 
diff --git a/devel/ruby-amstd/distinfo b/devel/ruby-amstd/distinfo
index f5e1ccd8a266..1e491faf87e3 100644
--- a/devel/ruby-amstd/distinfo
+++ b/devel/ruby-amstd/distinfo
@@ -1 +1 @@
-MD5 (ruby/amstd-1.9.6.tar.gz) = 03b96f6da38fbb808c47ce40db616a94
+MD5 (ruby/amstd-1.10.0.tar.gz) = f2fcbc9fdc66216c9dd63b593c55d794
diff --git a/devel/ruby-amstd/pkg-plist b/devel/ruby-amstd/pkg-plist
index 7cc011e5be33..0c2196c97cde 100644
--- a/devel/ruby-amstd/pkg-plist
+++ b/devel/ruby-amstd/pkg-plist
@@ -1,9 +1,11 @@
+%%RUBY_SITELIBDIR%%/amstd/aliascm.rb
 %%RUBY_SITELIBDIR%%/amstd/bench.rb
 %%RUBY_SITELIBDIR%%/amstd/bug.rb
 %%RUBY_SITELIBDIR%%/amstd/collfrom.rb
 %%RUBY_SITELIBDIR%%/amstd/constdef.rb
+%%RUBY_SITELIBDIR%%/amstd/d.rb
+%%RUBY_SITELIBDIR%%/amstd/daemon.rb
 %%RUBY_SITELIBDIR%%/amstd/dispatch.rb
-%%RUBY_SITELIBDIR%%/amstd/errutil.rb
 %%RUBY_SITELIBDIR%%/amstd/extmod.rb
 %%RUBY_SITELIBDIR%%/amstd/fileutils.rb
 %%RUBY_SITELIBDIR%%/amstd/futils.rb
@@ -11,7 +13,7 @@
 %%RUBY_SITELIBDIR%%/amstd/getdep.rb
 %%RUBY_SITELIBDIR%%/amstd/info.rb
 %%RUBY_SITELIBDIR%%/amstd/must.rb
-%%RUBY_SITELIBDIR%%/amstd/pipeline.rb
+%%RUBY_SITELIBDIR%%/amstd/protect.rb
 %%RUBY_SITELIBDIR%%/amstd/rbparams.rb
 %%RUBY_SITELIBDIR%%/amstd/recycle.rb
 %%RUBY_SITELIBDIR%%/amstd/rubyemu.rb