diff --git a/databases/grass/Makefile b/databases/grass/Makefile
index 76f28b8a355b..40811b343ece 100644
--- a/databases/grass/Makefile
+++ b/databases/grass/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	grass
 PORTVERSION=	6.2.3
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	databases geography
 MASTER_SITES=	http://grass.itc.it/grass62/source/ \
@@ -28,7 +29,8 @@ COMMENT=	An open source Geographical Information System (GIS)
 BUILD_DEPENDS=	proj:${PORTSDIR}/graphics/proj \
 		gdal-config:${PORTSDIR}/graphics/gdal
 RUN_DEPENDS=	proj:${PORTSDIR}/graphics/proj \
-		gdal-config:${PORTSDIR}/graphics/gdal
+		gdal-config:${PORTSDIR}/graphics/gdal \
+		bash:${PORTSDIR}/shells/bash
 LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
 		png.5:${PORTSDIR}/graphics/png \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
@@ -61,14 +63,21 @@ CONFIGURE_ARGS=	--with-includes=${LOCALBASE}/include \
 		--with-nls \
 		--with-cxx \
 		--with-readline \
+		--with-curses \
 		--enable-largefile
 
 PLIST_SUB=	GRASS_INST_DIR=${GRASS_INST_DIR} \
-		VERSION=${PORTVERSION}
+		VERSION=${PORTVERSION} \
+		VER=${PORTVERSION:R:C/\.//}
 USE_LDCONFIG=	${PREFIX}/${GRASS_INST_DIR}/lib
 
-OPTIONS=	MYSQL "Enable MySQL support" Off \
-		PGSQL "Enable PostgreSQL support" On
+OPTIONS=	MYSQL	"Enable MySQL support" Off \
+		ODBC	"Enable ODBC support" Off \
+		PGSQL	"Enable PostgreSQL support" On \
+		SQLITE	"Enable SQLite support" Off
+
+BASH_SCRIPTS=	i.spectral r.mapcalculator r.tileset r3.mapcalculator \
+		v.in.gpsbabel
 
 .include <bsd.port.pre.mk>
 
@@ -85,6 +94,15 @@ PLIST_SUB+=	MYSQL=""
 .else
 PLIST_SUB+=	MYSQL="@comment "
 .endif
+
+.if defined(WITH_ODBC)
+LIB_DEPENDS+=	odbc:${PORTSDIR}/databases/unixODBC
+CONFIGURE_ARGS+=--with-odbc
+PLIST_SUB+=	ODBC=""
+.else
+PLIST_SUB+=	ODBC="@comment "
+.endif
+
 .if defined(WITHOUT_PGSQL)
 CONFIGURE_ARGS+=--without-postgres
 PLIST_SUB+=	PGSQL="@comment "
@@ -93,8 +111,20 @@ USE_PGSQL=	yes
 PLIST_SUB+=	PGSQL=""
 .endif
 
-post-extract:
-	@${REINPLACE_CMD} -E '/^INST_DIR=/s|/grass-.*|/${GRASS_INST_DIR}|g' \
-	${WRKSRC}/Makefile
+.if defined(WITH_SQLITE)
+USE_SQLITE=	yes
+CONFIGURE_ARGS+=--with-sqlite
+PLIST_SUB+=	SQLITE=""
+.else
+PLIST_SUB+=	SQLITE="@comment "
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e "/^INST_DIR=/s|grass-.*|${GRASS_INST_DIR}|" \
+		${WRKSRC}/Makefile
+.for s in ${BASH_SCRIPTS}
+	@${REINPLACE_CMD} -e "1s|/bin/bash|${LOCALBASE}/bin/bash|" \
+		 ${WRKSRC}/scripts/$s/$s
+.endfor
 
 .include <bsd.port.post.mk>
diff --git a/databases/grass/pkg-plist b/databases/grass/pkg-plist
index 0beae71e12da..a0f7695fedde 100644
--- a/databases/grass/pkg-plist
+++ b/databases/grass/pkg-plist
@@ -1,5 +1,5 @@
-bin/gem
-bin/grass62
+bin/grass%%VER%%
+bin/grass%%VER%%-gem
 %%GRASS_INST_DIR%%/bin/bmif_to_cell
 %%GRASS_INST_DIR%%/bin/d.ask
 %%GRASS_INST_DIR%%/bin/d.barscale
@@ -466,7 +466,11 @@ bin/grass62
 %%GRASS_INST_DIR%%/docs/html/g.version.html
 %%GRASS_INST_DIR%%/docs/html/gis.m.html
 %%GRASS_INST_DIR%%/docs/html/grass-dbf.html
-%%GRASS_INST_DIR%%/docs/html/grass-pg.html
+%%MYSQL%%%%GRASS_INST_DIR%%/docs/html/grass-mesql.html
+%%MYSQL%%%%GRASS_INST_DIR%%/docs/html/grass-mysql.html
+%%ODBC%%%%GRASS_INST_DIR%%/docs/html/grass-odbc.html
+%%PGSQL%%%%GRASS_INST_DIR%%/docs/html/grass-pg.html
+%%SQLITE%%%%GRASS_INST_DIR%%/docs/html/grass-sqlite.html
 %%GRASS_INST_DIR%%/docs/html/grass6.html
 %%GRASS_INST_DIR%%/docs/html/grass_logo.txt
 %%GRASS_INST_DIR%%/docs/html/helptext.html
@@ -962,8 +966,10 @@ bin/grass62
 %%GRASS_INST_DIR%%/driver/XDRIVER
 %%GRASS_INST_DIR%%/driver/db/dbf
 %%MYSQL%%%%GRASS_INST_DIR%%/driver/db/mysql
+%%ODBC%%%%GRASS_INST_DIR%%/driver/db/odbc
 %%GRASS_INST_DIR%%/driver/db/ogr
 %%PGSQL%%%%GRASS_INST_DIR%%/driver/db/pg
+%%SQLITE%%%%GRASS_INST_DIR%%/driver/db/sqlite
 %%GRASS_INST_DIR%%/etc/BUILD
 %%GRASS_INST_DIR%%/etc/FIPS.code
 %%GRASS_INST_DIR%%/etc/Init.sh
@@ -1799,7 +1805,11 @@ bin/grass62
 %%GRASS_INST_DIR%%/man/man1/g.version.1
 %%GRASS_INST_DIR%%/man/man1/gis.m.1
 %%GRASS_INST_DIR%%/man/man1/grass-dbf.1
-%%GRASS_INST_DIR%%/man/man1/grass-pg.1
+%%MYSQL%%%%GRASS_INST_DIR%%/man/man1/grass-mesql.1
+%%MYSQL%%%%GRASS_INST_DIR%%/man/man1/grass-mysql.1
+%%ODBC%%%%GRASS_INST_DIR%%/man/man1/grass-odbc.1
+%%PGSQL%%%%GRASS_INST_DIR%%/man/man1/grass-pg.1
+%%SQLITE%%%%GRASS_INST_DIR%%/man/man1/grass-sqlite.1
 %%GRASS_INST_DIR%%/man/man1/grass6.1
 %%GRASS_INST_DIR%%/man/man1/helptext.1
 %%GRASS_INST_DIR%%/man/man1/i.ask.1