diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk
index 9f8aa9409f08..7ed25ea7be44 100644
--- a/Mk/bsd.ruby.mk
+++ b/Mk/bsd.ruby.mk
@@ -173,7 +173,7 @@ RUBY_RD_PORT?=		textproc/ruby-rdtool
 # Depends
 DEPEND_LIBRUBY?=	${RUBY_NAME}.${RUBY_SHLIBVER}:${PORTSDIR}/${RUBY_PORT}
 DEPEND_RUBY?=		${RUBY}:${PORTSDIR}/${RUBY_PORT}
-DEPEND_RUBY_AMSTD?=	${RUBY_SITELIBDIR}/amstd/info.rb:${PORTSDIR}/${RUBY_AMSTD_PORT}
+DEPEND_RUBY_AMSTD?=	${RUBY_SITELIBDIR}/amstd/version.rb:${PORTSDIR}/${RUBY_AMSTD_PORT}
 DEPEND_RUBY_RD2?=	${RUBY_RD}:${PORTSDIR}/${RUBY_RD_PORT}
 
 # Directories
diff --git a/devel/ruby-amstd/Makefile b/devel/ruby-amstd/Makefile
index c407e6e3fb3d..530448531ccf 100644
--- a/devel/ruby-amstd/Makefile
+++ b/devel/ruby-amstd/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	amstd
-PORTVERSION=	1.10.0
+PORTVERSION=	2.0.0
 CATEGORIES=	devel ruby
 MASTER_SITES=	http://www.loveruby.net/archive/%SUBDIR%/
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,9 +17,10 @@ MAINTAINER=	knu@FreeBSD.org
 
 USE_RUBY=	yes
 USE_RUBY_SETUP=	yes
+RUBY_SETUP=	install.rb
 
 DOCS_EN=	README.en
-DOCS_JA=	README.ja amstd-ja.rd
+DOCS_JA=	README.ja manual.rd.ja
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/devel/ruby-amstd/distinfo b/devel/ruby-amstd/distinfo
index 1e491faf87e3..43bd2c98fcfa 100644
--- a/devel/ruby-amstd/distinfo
+++ b/devel/ruby-amstd/distinfo
@@ -1 +1 @@
-MD5 (ruby/amstd-1.10.0.tar.gz) = f2fcbc9fdc66216c9dd63b593c55d794
+MD5 (ruby/amstd-2.0.0.tar.gz) = 0b9b409d57a4b2ebb17990422fbb6800
diff --git a/devel/ruby-amstd/pkg-plist b/devel/ruby-amstd/pkg-plist
index 0c2196c97cde..47aa747539ed 100644
--- a/devel/ruby-amstd/pkg-plist
+++ b/devel/ruby-amstd/pkg-plist
@@ -1,30 +1,18 @@
-%%RUBY_SITELIBDIR%%/amstd/aliascm.rb
-%%RUBY_SITELIBDIR%%/amstd/bench.rb
+%%RUBY_SITELIBDIR%%/amstd/aliasing.rb
+%%RUBY_SITELIBDIR%%/amstd/benchmark.rb
 %%RUBY_SITELIBDIR%%/amstd/bug.rb
-%%RUBY_SITELIBDIR%%/amstd/collfrom.rb
-%%RUBY_SITELIBDIR%%/amstd/constdef.rb
+%%RUBY_SITELIBDIR%%/amstd/const.rb
 %%RUBY_SITELIBDIR%%/amstd/d.rb
 %%RUBY_SITELIBDIR%%/amstd/daemon.rb
-%%RUBY_SITELIBDIR%%/amstd/dispatch.rb
-%%RUBY_SITELIBDIR%%/amstd/extmod.rb
-%%RUBY_SITELIBDIR%%/amstd/fileutils.rb
-%%RUBY_SITELIBDIR%%/amstd/futils.rb
-%%RUBY_SITELIBDIR%%/amstd/gconst.rb
-%%RUBY_SITELIBDIR%%/amstd/getdep.rb
-%%RUBY_SITELIBDIR%%/amstd/info.rb
 %%RUBY_SITELIBDIR%%/amstd/must.rb
 %%RUBY_SITELIBDIR%%/amstd/protect.rb
 %%RUBY_SITELIBDIR%%/amstd/rbparams.rb
-%%RUBY_SITELIBDIR%%/amstd/recycle.rb
-%%RUBY_SITELIBDIR%%/amstd/rubyemu.rb
-%%RUBY_SITELIBDIR%%/amstd/strquote.rb
-%%RUBY_SITELIBDIR%%/amstd/symbol.rb
+%%RUBY_SITELIBDIR%%/amstd/rubyloader.rb
 %%RUBY_SITELIBDIR%%/amstd/timer.rb
-%%RUBY_SITELIBDIR%%/amstd/to_s.rb
 %%RUBY_SITELIBDIR%%/amstd/version.rb
 @dirrm %%RUBY_SITELIBDIR%%/amstd
 %%PORTDOCS%%%%RUBY_DOCDIR%%/amstd/README.en
 %%PORTDOCS%%%%RUBY_DOCDIR%%/amstd/ja/README.ja
-%%PORTDOCS%%%%RUBY_DOCDIR%%/amstd/ja/amstd-ja.rd
+%%PORTDOCS%%%%RUBY_DOCDIR%%/amstd/ja/manual.rd.ja
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/amstd/ja
 %%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/amstd