diff --git a/www/kannel/Makefile b/www/kannel/Makefile
index 2b1966ebe349..90d437d3b2ea 100644
--- a/www/kannel/Makefile
+++ b/www/kannel/Makefile
@@ -10,66 +10,45 @@ MASTER_SITE_SUBDIR=	${PORTVERSION}
 DISTNAME=	gateway-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	WAP / SMS Gateway
+COMMENT=	WAP/SMS gateway
 
-LIB_DEPENDS=	pcre:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
 
-USE_RC_SUBR=	kannel
+USES=		gmake
+USE_BZIP2=	yes
 USE_GNOME=	libxml2
 USE_OPENSSL=	yes
-USE_GMAKE=	yes
-USE_BZIP2=	yes
+USE_RC_SUBR=	${PORTNAME}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-cflags="${CPPFLAGS}" --with-libs="${LDFLAGS}" \
 		--enable-pcre=yes --enable-docs=no --with-malloc=native \
 		--enable-start-stop-daemon=no --without-sdb --without-oracle \
 		--without-sqlite2
 
-MAN1=		mtbatch.1 seewbmp.1 wmlsc.1 wmlsdasm.1
-MAN8=		kannel.8 run_kannel_box.8
-
-OPTIONS_DEFINE=	MYSQL PGSQL SQLITE3
-
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -pthread
 
-.if ${PORT_OPTIONS:MMYSQL}
-USE_MYSQL=	yes
-CONFIGURE_ARGS+=--with-mysql
-.else
-CONFIGURE_ARGS+=--without-mysql
-.endif
+OPTIONS_DEFINE=	MYSQL PGSQL SQLITE3
 
-.if ${PORT_OPTIONS:MPGSQL}
-USE_PGSQL=	yes
-CONFIGURE_ARGS+=--with-pgsql
-.else
-CONFIGURE_ARGS+=--without-pgsql
-.endif
+SQLITE3_USE=	SQLITE=3
+SQLITE3_CONFIGURE_WITH=	sqlite3
 
-.if ${PORT_OPTIONS:MSQLITE3}
-USE_SQLITE=	3
-CONFIGURE_ARGS+=--with-sqlite3
-.else
-CONFIGURE_ARGS+=--without-sqlite3
-.endif
+MYSQL_USE=	MYSQL=yes
+MYSQL_CONFIGURE_WITH=	mysql
 
-.if ${ARCH} == "alpha"
-BROKEN=		Does not compile on alpha
-.endif
+PGSQL_USE=	PGSQL=yes
+PGSQL_CONFIGURE_WITH=	pgsql
 
 post-install:
 .for filename in wapkannel.conf smskannel.conf
-	${INSTALL_DATA} ${WRKSRC}/gw/${filename} ${PREFIX}/etc/${filename}.sample
+	${INSTALL_DATA} ${WRKSRC}/gw/${filename} \
+		${STAGEDIR}${PREFIX}/etc/${filename}.sample
 .endfor
 .for filename in mtbatch seewbmp wmlsc wmlsdasm
-	@${STRIP_CMD} ${PREFIX}/bin/${filename}
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${filename}
 .endfor
 .for filename in bearerbox run_kannel_box smsbox wapbox
-	@${STRIP_CMD} ${PREFIX}/sbin/${filename}
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/${filename}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/www/kannel/pkg-descr b/www/kannel/pkg-descr
index 5e74a9c8635a..1f3e3e55cca4 100644
--- a/www/kannel/pkg-descr
+++ b/www/kannel/pkg-descr
@@ -1,4 +1,4 @@
-Kannel is an open source project to make a WAP gateway. Kannel also
-works as a SMS gateway.
+Kannel is an open source project to make a WAP gateway; it also can work as
+an SMS gateway.
 
 WWW: http://www.kannel.org/
diff --git a/www/kannel/pkg-plist b/www/kannel/pkg-plist
index 9dfe5ce595a8..f21ee7aff4ae 100644
--- a/www/kannel/pkg-plist
+++ b/www/kannel/pkg-plist
@@ -139,6 +139,12 @@ include/kannel/wap/wtp_tid.h
 lib/kannel/libgw.a
 lib/kannel/libgwlib.a
 lib/kannel/libwap.a
+man/man1/mtbatch.1.gz
+man/man1/seewbmp.1.gz
+man/man1/wmlsc.1.gz
+man/man1/wmlsdasm.1.gz
+man/man8/kannel.8.gz
+man/man8/run_kannel_box.8.gz
 sbin/bearerbox
 sbin/run_kannel_box
 sbin/smsbox