diff --git a/textproc/groonga/Makefile b/textproc/groonga/Makefile
index 89fe316a26e6..a294f9c513a4 100644
--- a/textproc/groonga/Makefile
+++ b/textproc/groonga/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	groonga
-PORTVERSION=	6.0.4
+PORTVERSION=	6.0.5
 CATEGORIES=	textproc
 MASTER_SITES=	http://packages.groonga.org/source/groonga/
 
@@ -12,7 +12,7 @@ LICENSE=	LGPL21
 
 LIB_DEPENDS=	libpcre.so:devel/pcre
 
-USES=		gmake libtool pathfix pkgconfig
+USES=		execinfo gmake libedit libtool pathfix pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-benchmark \
 		--disable-document \
@@ -58,7 +58,7 @@ post-patch:
 		'/NGX_PID_PATH/s|mkdir|${TRUE}| ; \
 		 /NGX_HTTP_LOG_PATH/s|mkdir|${TRUE}| ; \
 		 /NGX_ERROR_LOG_PATH/s|mkdir|${TRUE}|' \
-		${WRKSRC}/vendor/nginx-1.11.0/auto/install
+		${WRKSRC}/vendor/nginx-1.11.1/auto/install
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/groonga-httpd
diff --git a/textproc/groonga/distinfo b/textproc/groonga/distinfo
index 1227f0a1b503..49c296a53826 100644
--- a/textproc/groonga/distinfo
+++ b/textproc/groonga/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1465556857
-SHA256 (groonga-6.0.4.tar.gz) = 2c6ebe7e5b1065b777cbc5c6696a47a2b7da510b4c3e785f45437a56ad65ad58
-SIZE (groonga-6.0.4.tar.gz) = 13687702
+TIMESTAMP = 1468524942
+SHA256 (groonga-6.0.5.tar.gz) = a3323b5abea048483257a96611477921e3e342690a26f260feb340a3e97a1438
+SIZE (groonga-6.0.5.tar.gz) = 13603735
diff --git a/textproc/groonga/pkg-plist b/textproc/groonga/pkg-plist
index e495cda82177..a4ff94118d58 100644
--- a/textproc/groonga/pkg-plist
+++ b/textproc/groonga/pkg-plist
@@ -35,6 +35,7 @@ include/groonga/groonga/file_reader.h
 include/groonga/groonga/geo.h
 include/groonga/groonga/groonga.h
 include/groonga/groonga/hash.h
+include/groonga/groonga/id.h
 include/groonga/groonga/ii.h
 include/groonga/groonga/nfkc.h
 include/groonga/groonga/normalizer.h
@@ -96,10 +97,14 @@ lib/groonga/plugins/query_expanders/tsv.so
 %%RUBY%%lib/groonga/scripts/ruby/expression_rewriters.rb
 %%RUBY%%lib/groonga/scripts/ruby/expression_size_estimator.rb
 %%RUBY%%lib/groonga/scripts/ruby/expression_tree.rb
+%%RUBY%%lib/groonga/scripts/ruby/expression_tree/accessor.rb
 %%RUBY%%lib/groonga/scripts/ruby/expression_tree/binary_operation.rb
 %%RUBY%%lib/groonga/scripts/ruby/expression_tree/constant.rb
 %%RUBY%%lib/groonga/scripts/ruby/expression_tree/function_call.rb
+%%RUBY%%lib/groonga/scripts/ruby/expression_tree/index_column.rb
 %%RUBY%%lib/groonga/scripts/ruby/expression_tree/logical_operation.rb
+%%RUBY%%lib/groonga/scripts/ruby/expression_tree/options.rb
+%%RUBY%%lib/groonga/scripts/ruby/expression_tree/procedure.rb
 %%RUBY%%lib/groonga/scripts/ruby/expression_tree/variable.rb
 %%RUBY%%lib/groonga/scripts/ruby/expression_tree_builder.rb
 %%RUBY%%lib/groonga/scripts/ruby/fixed_size_column.rb