Index: databases/couchdb2/Makefile
===================================================================
--- databases/couchdb2/Makefile
+++ databases/couchdb2/Makefile
@@ -17,10 +17,12 @@
 LIB_DEPENDS=	libicudata.so:devel/icu \
 		libmozjs185.so:lang/spidermonkey185
 
+USES=		cpe gmake libtool ncurses python:run shebangfix
+USE_RC_SUBR=	couchdb2
+
 USERS=		couchdb
 GROUPS=		couchdb
 
-USES=		cpe gmake libtool ncurses python:run shebangfix
 SHEBANG_FILES=	rel/overlay/bin/couchup
 
 DBDIR?=		/var/db/${PORTNAME}
@@ -28,7 +30,6 @@
 APPDIR=		${LOCALBASE}/libexec/${PORTNAME}
 RELDIR=		${APPDIR}/releases/${DISTVERSION}
 
-USE_RC_SUBR=	couchdb2
 SUB_FILES=	pkg-message couchdb2
 SUB_LIST=	PORTNAME=${PORTNAME} APPDIR=${APPDIR} RELDIR=${RELDIR} ERL_PATH=${ERL_PATH}
 PLIST_SUB=	VERSION=${DISTVERSION}
@@ -78,12 +79,15 @@
 	${FIND} -E ${WRKSRC} -type f \
 		-regex '.*\.(a|buildinfo|c|cc|cmd|d|h|o|orig)' -delete
 	# remove runtime dirs and files that were moved to match hier(7)
-	${RM} -rf ${WRKSRC}/rel/couchdb/var \
+	${RM} -r ${WRKSRC}/rel/couchdb/var \
 		${WRKSRC}/rel/couchdb/etc/*.d \
 		${WRKSRC}/rel/couchdb/releases/*/vm.args
-	(cd ${WRKSRC}/rel/couchdb && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/libexec/couchdb2)
+	(cd ${WRKSRC}/rel/couchdb && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/libexec/${PORTNAME})
 
 post-install:
+.for l in $(${FIND} -E ${STAGEDIR} -type f -regex '/(couchjs|.+.so)$')
+		${STRIP_CMD} ${l}
+.endfor
 	${MKDIR} \
 		${STAGEDIR}/var/db/${PORTNAME} \
 		${STAGEDIR}/var/log/${PORTNAME} \
Index: databases/couchdb2/files/pkg-message.in
===================================================================
--- databases/couchdb2/files/pkg-message.in
+++ databases/couchdb2/files/pkg-message.in
@@ -26,6 +26,8 @@
 curl -X PUT http://admin:passwd@127.0.0.1:5984/_replicator
 curl -X PUT http://admin:passwd@127.0.0.1:5984/_global_changes
 
+Then use the admin interface at http://127.0.0.1:5984/_utils/# as usual.
+
 For more information see
 http://docs.couchdb.org/en/latest/install/setup.html
 ***********************************************************