diff --git a/www/kannel/Makefile b/www/kannel/Makefile
index 206d89c87c41..38e6919eefd1 100644
--- a/www/kannel/Makefile
+++ b/www/kannel/Makefile
@@ -1,64 +1,65 @@
 PORTNAME=	kannel
 PORTVERSION=	1.4.4
-PORTREVISION=	13
+PORTREVISION=	14
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.kannel.org/download/${PORTVERSION}/
 DISTNAME=	gateway-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	WAP/SMS gateway
 WWW=		http://www.kannel.org/
 
 LICENSE=	The_Kannel_Software_License
 LICENSE_NAME=	The Kannel Software License, Version 1.0
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 LIB_DEPENDS=	libpcre.so:devel/pcre
 
 USES=		cpe gmake gnome iconv ssl tar:bzip2
 USE_GCC=	yes
 USE_GNOME=	libxml2
 USE_RC_SUBR=	${PORTNAME}_bearerbox ${PORTNAME}_smsbox ${PORTNAME}_wapbox
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=	--enable-pcre=yes --enable-docs=no --with-malloc=native \
 		--enable-start-stop-daemon=no
 
 CFLAGS+=	-fcommon
 
 PORTSCOUT=	skipv:1.5.0
 
 USERS=		kannel
 GROUPS=		kannel
 
 OPTIONS_DEFINE=	MYSQL PGSQL SQLITE3
 OPTIONS_DEFAULT=	SQLITE3
 
 MYSQL_USES=	mysql
 MYSQL_CONFIGURE_WITH=	mysql
 MYSQL_VARS=	IGNORE_WITH_MYSQL="80 81"
 PGSQL_USES=	pgsql
 PGSQL_CONFIGURE_WITH=	pgsql
 SQLITE3_USES=	sqlite:3
 SQLITE3_CONFIGURE_WITH=	sqlite3
 
 post-patch:
 	@${RM} ${WRKSRC}/wmlscript/wsgram.y
 
 post-install:
 .for filename in wapkannel.conf smskannel.conf
 	${INSTALL_DATA} ${WRKSRC}/gw/${filename} \
 		${STAGEDIR}${PREFIX}/etc/${filename}.sample
 .endfor
 .for filename in mtbatch seewbmp wmlsc wmlsdasm decode_emimsg
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${filename}
 .endfor
 .for filename in bearerbox run_kannel_box smsbox wapbox
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/${filename}
 .endfor
 	@${MKDIR} ${STAGEDIR}/var/log/kannel
 	@${MKDIR} ${STAGEDIR}/var/run/kannel
 
 .include <bsd.port.mk>
diff --git a/www/kannel/pkg-plist b/www/kannel/pkg-plist
index f74c94909c99..bd1747962f3b 100644
--- a/www/kannel/pkg-plist
+++ b/www/kannel/pkg-plist
@@ -1,159 +1,159 @@
 bin/decode_emimsg
 bin/gw-config
 bin/mtbatch
 bin/seewbmp
 bin/wmlsc
 bin/wmlsdasm
 @sample etc/smskannel.conf.sample
 @sample etc/wapkannel.conf.sample
 include/kannel/gw-config.h
 include/kannel/gw/alt_charsets.h
 include/kannel/gw/bb.h
 include/kannel/gw/bb_smscconn_cb.h
 include/kannel/gw/bb_store.h
 include/kannel/gw/bearerbox.h
 include/kannel/gw/dlr.h
 include/kannel/gw/dlr_p.h
 include/kannel/gw/heartbeat.h
 include/kannel/gw/html.h
 include/kannel/gw/load.h
 include/kannel/gw/meta_data.h
 include/kannel/gw/mime_decompiler.h
 include/kannel/gw/msg-decl.h
 include/kannel/gw/msg.h
 include/kannel/gw/numhash.h
 include/kannel/gw/ota_compiler.h
 include/kannel/gw/ota_prov.h
 include/kannel/gw/ota_prov_attr.h
 include/kannel/gw/shared.h
 include/kannel/gw/sms.h
 include/kannel/gw/smsc/emimsg.h
 include/kannel/gw/smsc/smasi_pdu.def
 include/kannel/gw/smsc/smasi_pdu.h
 include/kannel/gw/smsc/smpp_pdu.def
 include/kannel/gw/smsc/smpp_pdu.h
 include/kannel/gw/smsc/smpp_pdu_opt.def
 include/kannel/gw/smsc/smsc.h
 include/kannel/gw/smsc/smsc_at.h
 include/kannel/gw/smsc/smsc_p.h
 include/kannel/gw/smsc/smsc_sema.h
 include/kannel/gw/smscconn.h
 include/kannel/gw/smscconn_p.h
 include/kannel/gw/urltrans.h
 include/kannel/gw/wap-appl.h
 include/kannel/gw/wap-error.h
 include/kannel/gw/wap-maps.h
 include/kannel/gw/wap_ppg_push_machine.def
 include/kannel/gw/wap_ppg_session_machine.def
 include/kannel/gw/wap_push_ota.h
 include/kannel/gw/wap_push_pap_compiler.h
 include/kannel/gw/wap_push_pap_mime.h
 include/kannel/gw/wap_push_ppg.h
 include/kannel/gw/wap_push_ppg_pushuser.h
 include/kannel/gw/wap_push_si_compiler.h
 include/kannel/gw/wap_push_sl_compiler.h
 include/kannel/gw/wbxml_tokens.def
 include/kannel/gw/wml_compiler.h
 include/kannel/gw/wml_definitions.h
 include/kannel/gw/xml_definitions.h
 include/kannel/gw/xml_shared.h
 include/kannel/gwlib/accesslog.h
 include/kannel/gwlib/cfg.def
 include/kannel/gwlib/cfg.h
 include/kannel/gwlib/charset.h
 include/kannel/gwlib/conn.h
 include/kannel/gwlib/counter.h
 include/kannel/gwlib/date.h
 include/kannel/gwlib/dbpool.h
 include/kannel/gwlib/dbpool_p.h
 include/kannel/gwlib/dict.h
 include/kannel/gwlib/fdset.h
 include/kannel/gwlib/gw-getopt.h
 include/kannel/gwlib/gw-prioqueue.h
 include/kannel/gwlib/gw-rwlock.h
 include/kannel/gwlib/gw-timer.h
 include/kannel/gwlib/gw_uuid.h
 include/kannel/gwlib/gw_uuid_types.h
 include/kannel/gwlib/gwassert.h
 include/kannel/gwlib/gwlib.h
 include/kannel/gwlib/gwmem.h
 include/kannel/gwlib/gwpoll.h
 include/kannel/gwlib/gwthread.h
 include/kannel/gwlib/html-entities.def
 include/kannel/gwlib/http.h
 include/kannel/gwlib/latin1_to_gsm.h
 include/kannel/gwlib/list.h
 include/kannel/gwlib/log.h
 include/kannel/gwlib/md5.h
 include/kannel/gwlib/mime.h
 include/kannel/gwlib/octstr.h
 include/kannel/gwlib/parse.h
 include/kannel/gwlib/pcre.h
 include/kannel/gwlib/pki.h
 include/kannel/gwlib/protected.h
 include/kannel/gwlib/regex.h
 include/kannel/gwlib/semaphore.h
 include/kannel/gwlib/socket.h
 include/kannel/gwlib/ssl.h
 include/kannel/gwlib/thread.h
 include/kannel/gwlib/utils.h
 include/kannel/gwlib/xmlrpc.h
 include/kannel/wap/cookies.h
 include/kannel/wap/timers.h
 include/kannel/wap/wap.h
 include/kannel/wap/wap_addr.h
 include/kannel/wap/wap_events.def
 include/kannel/wap/wap_events.h
 include/kannel/wap/wsp.h
 include/kannel/wap/wsp_caps.h
 include/kannel/wap/wsp_headers.h
 include/kannel/wap/wsp_pdu.def
 include/kannel/wap/wsp_pdu.h
 include/kannel/wap/wsp_push_client.h
 include/kannel/wap/wsp_push_client_machine.def
 include/kannel/wap/wsp_push_client_states.def
 include/kannel/wap/wsp_server_method_machine.def
 include/kannel/wap/wsp_server_method_states.def
 include/kannel/wap/wsp_server_push_machine.def
 include/kannel/wap/wsp_server_push_states.def
 include/kannel/wap/wsp_server_session_machine.def
 include/kannel/wap/wsp_server_session_states.def
 include/kannel/wap/wsp_strings.def
 include/kannel/wap/wsp_strings.h
 include/kannel/wap/wtls.h
 include/kannel/wap/wtls_machine-decl.h
 include/kannel/wap/wtls_pdu.h
 include/kannel/wap/wtls_pdusupport.h
 include/kannel/wap/wtls_state-decl.h
 include/kannel/wap/wtls_statesupport.h
 include/kannel/wap/wtp.h
 include/kannel/wap/wtp_init.h
 include/kannel/wap/wtp_init_machine.def
 include/kannel/wap/wtp_init_states.def
 include/kannel/wap/wtp_pack.h
 include/kannel/wap/wtp_pdu.def
 include/kannel/wap/wtp_pdu.h
 include/kannel/wap/wtp_resp.h
 include/kannel/wap/wtp_resp_machine.def
 include/kannel/wap/wtp_resp_states.def
 include/kannel/wap/wtp_tid.h
 lib/kannel/libgw.a
 lib/kannel/libgwlib.a
 lib/kannel/libwap.a
 lib/kannel/libwmlscript.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
+share/man/man1/mtbatch.1.gz
+share/man/man1/seewbmp.1.gz
+share/man/man1/wmlsc.1.gz
+share/man/man1/wmlsdasm.1.gz
+share/man/man8/kannel.8.gz
+share/man/man8/run_kannel_box.8.gz
 sbin/bearerbox
 sbin/run_kannel_box
 sbin/smsbox
 sbin/wapbox
 @owner kannel
 @group kannel
 @dir /var/log/kannel
 @dir /var/run/kannel
 @group
 @owner