diff --git a/www/xapian-omega/Makefile b/www/xapian-omega/Makefile
index 6bf86b86f4ca..03a853d52289 100644
--- a/www/xapian-omega/Makefile
+++ b/www/xapian-omega/Makefile
@@ -1,69 +1,65 @@
 # Created by: Henrik Brix Andersen <brix@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	xapian-omega
 PORTVERSION=	1.2.15
 CATEGORIES=	www
 MASTER_SITES=	http://oligarchy.co.uk/xapian/${PORTVERSION}/ \
 		LOCAL/sunpoet
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	CGI search application built on Xapian
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	pcre:${PORTSDIR}/devel/pcre \
-		xapian:${PORTSDIR}/databases/xapian-core
+LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre \
+		libxapian.so:${PORTSDIR}/databases/xapian-core
 
 OPTIONS_DEFINE=	DOCS EXAMPLES ICONV
 OPTIONS_DEFAULT=ICONV
 ICONV_DESC=	Enable iconv character set conversion support
 
 PORTSCOUT=	limitw:1,even
 
 CONFIGURE_ENV=	PCRE_CONFIG=${LOCALBASE}/bin/pcre-config \
 		XAPIAN_CONFIG=${LOCALBASE}/bin/xapian-config
 CPPFLAGS+=	-I${LOCALBASE}/include
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
-USES=		perl5
+USES=		perl5 shebangfix
 
-MAN1=		omindex.1 scriptindex.1
 MORE_PORTDOCS=	AUTHORS ChangeLog NEWS README TODO
 PORTDOCS=	cgiparams.html index.html omegascript.html overview.html \
 		quickstart.html scriptindex.html termprefixes.html \
 		${MORE_PORTDOCS}
 PORTEXAMPLES=	omega.conf
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+SHEBANG_FILES=	dbi2omega htdig2omega mbox2omega
 
-.if ${PORT_OPTIONS:MICONV}
-USES+=		iconv
-LDFLAGS+=	${ICONV_LIB}
-CONFIGURE_ARGS+=--with-iconv
-.else
-CONFIGURE_ARGS+=--without-iconv
-.endif
+ICONV_CONFIGURE_WITH=	iconv
+ICONV_LDFLAGS=		${ICONV_LIB}
+ICONV_USES=		iconv
+
+.include <bsd.port.options.mk>
 
 post-patch:
 	@${REINPLACE_CMD} \
 		-e '/^dist_sysconf_DATA = /d' \
 		-e '/^pkglibbindir = / s| = .*$$| = ${WWWDIR}/cgi-bin|' \
 			${WRKSRC}/Makefile.in
 .if !${PORT_OPTIONS:MDOCS}
 	@${REINPLACE_CMD} -e '/^SUBDIRS = / s| docs||' ${WRKSRC}/Makefile.in
 .endif
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}/
-	cd ${WRKSRC}/ && ${INSTALL_DATA} ${MORE_PORTDOCS} ${DOCSDIR}/
+	${MKDIR} ${STAGEDIR}${DOCSDIR}/
+	cd ${WRKSRC}/ && ${INSTALL_DATA} ${MORE_PORTDOCS} ${STAGEDIR}${DOCSDIR}/
 .endif
 .if ${PORT_OPTIONS:MEXAMPLES}
-	${MKDIR} ${EXAMPLESDIR}/
-	cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTEXAMPLES} ${EXAMPLESDIR}/
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/
+	cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR}/
 .endif
 
 .include <bsd.port.mk>
diff --git a/www/xapian-omega/pkg-plist b/www/xapian-omega/pkg-plist
index d01d78496707..ac7328939dd1 100644
--- a/www/xapian-omega/pkg-plist
+++ b/www/xapian-omega/pkg-plist
@@ -1,12 +1,14 @@
 bin/dbi2omega
 bin/htdig2omega
 bin/mbox2omega
 bin/omindex
 bin/scriptindex
+man/man1/omindex.1.gz
+man/man1/scriptindex.1.gz
 share/omega/htdig2omega.script
 share/omega/mbox2omega.script
 %%WWWDIR%%/cgi-bin/omega
 %%WWWDIR%%/cgi-bin/outlookmsg2html
 @dirrm %%WWWDIR%%/cgi-bin
 @dirrm %%WWWDIR%%
 @dirrm share/omega