diff --git a/devel/rbenv/Makefile b/devel/rbenv/Makefile
index 301cc3af2e91..036b775b7b11 100644
--- a/devel/rbenv/Makefile
+++ b/devel/rbenv/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	rbenv
-PORTVERSION=	0.3.0
+PORTVERSION=	0.4.0
 CATEGORIES=	devel ruby
 MASTER_SITES=	GH
 
@@ -18,14 +18,16 @@ RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
 USE_GITHUB=	yes
 GH_ACCOUNT=	sstephenson
 GH_PROJECT=	rbenv
-GH_COMMIT=	b10bdb1
+GH_COMMIT=	9375e99
 GH_TAGNAME=	v${PORTVERSION}
 
 NO_BUILD=	yes
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/ruby-local-exec ${PREFIX}/bin
-	( cd ${WRKSRC}/libexec && ${COPYTREE_BIN} \* ${PREFIX}/libexec )
+	@${INSTALL_SCRIPT} ${WRKSRC}/bin/ruby-local-exec ${PREFIX}/bin
+	@( cd ${WRKSRC}/libexec && ${COPYTREE_BIN} \* ${PREFIX}/libexec )
 	@${LN} -sf ${PREFIX}/libexec/rbenv ${PREFIX}/bin/rbenv
+	@${MKDIR} ${DATADIR}/completions
+	@( cd ${WRKSRC}/completions && ${COPYTREE_BIN} \* ${DATADIR}/completions )
 
 .include <bsd.port.mk>
diff --git a/devel/rbenv/distinfo b/devel/rbenv/distinfo
index 21fba4069ccc..c6841e1635b7 100644
--- a/devel/rbenv/distinfo
+++ b/devel/rbenv/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rbenv-0.3.0.tar.gz) = 445b8d742bbb72a4e65280e655122914d13954566fe7f46c7706f7730bbeaa35
-SIZE (rbenv-0.3.0.tar.gz) = 13703
+SHA256 (rbenv-0.4.0.tar.gz) = e9b54d2d3669e52aed439094fa92aab36d826573e1a4f8dd65241406204a3e23
+SIZE (rbenv-0.4.0.tar.gz) = 16029
diff --git a/devel/rbenv/pkg-descr b/devel/rbenv/pkg-descr
index 06fb0fb25493..2c1a872623ab 100644
--- a/devel/rbenv/pkg-descr
+++ b/devel/rbenv/pkg-descr
@@ -1,5 +1,5 @@
-rbenv lets you easily switch between multiple versions of Ruby.
-It's simple, unobtrusive, and follows the UNIX tradition of
-single-purpose tools that do one thing well.
+Use rbenv to pick a Ruby version for your application and guarantee
+that your development environment matches production. Put rbenv to work
+with Bundler for painless Ruby upgrades and bulletproof deployments.
 
 WWW: https://github.com/sstephenson/rbenv
diff --git a/devel/rbenv/pkg-plist b/devel/rbenv/pkg-plist
index 85f31ddffcbf..1436e415b6a8 100644
--- a/devel/rbenv/pkg-plist
+++ b/devel/rbenv/pkg-plist
@@ -1,6 +1,7 @@
 bin/rbenv
 bin/ruby-local-exec
 libexec/rbenv
+libexec/rbenv---version
 libexec/rbenv-commands
 libexec/rbenv-completions
 libexec/rbenv-exec
@@ -12,6 +13,7 @@ libexec/rbenv-local
 libexec/rbenv-prefix
 libexec/rbenv-rehash
 libexec/rbenv-root
+libexec/rbenv-sh-rehash
 libexec/rbenv-sh-shell
 libexec/rbenv-shims
 libexec/rbenv-version
@@ -23,3 +25,7 @@ libexec/rbenv-version-origin
 libexec/rbenv-versions
 libexec/rbenv-whence
 libexec/rbenv-which
+%%DATADIR%%/completions/rbenv.bash
+%%DATADIR%%/completions/rbenv.zsh
+@dirrm %%DATADIR%%/completions
+@dirrm %%DATADIR%%