diff --git a/security/trousers/Makefile b/security/trousers/Makefile
index ef7c36e5d094..c6da30051f87 100644
--- a/security/trousers/Makefile
+++ b/security/trousers/Makefile
@@ -1,95 +1,93 @@
 # Created by: Sebastian Schuetz <sschuetz@fhm.edu>
 # $FreeBSD$
 
 PORTNAME=	trousers
 PORTVERSION=	0.3.6
 PORTREVISION=	3
 CATEGORIES=	security
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	The open-source TCG Software Stack
 
+LICENSE=	CPL
+LICENSE_NAME=	Common Public License
+LICENSE_FILE=	${WRKSRC}/LICENSE
+LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+
+USES=	gmake iconv pkgconfig
 USE_GCC=	any
-USE_GMAKE=	YES
 USE_OPENSSL=	YES
 USE_LDCONFIG=	YES
-USES=		pkgconfig iconv
 USE_AUTOTOOLS=	autoconf automake libtool
+USE_RC_SUBR=	tcsd
 GNU_CONFIGURE=	YES
 MAKE_JOBS_SAFE=	YES
-
-USE_RC_SUBR=	tcsd
 SUB_FILES=	pkg-message
 SUB_LIST=	USERS=${USERS} GROUPS=${GROUPS}
 
 USERS=		_tss
 GROUPS=		_tss
 
-LICENSE=	CPL
-LICENSE_NAME=	Common Public License
-LICENSE_FILE=	${WRKSRC}/LICENSE
-LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
-
 .include "Makefile.man"
 
 CONFIGURE_ARGS=	--with-gui=none --enable-static \
 		--localstatedir=${PREFIX}/var \
 		--with-tssuser=${USERS} --with-tssgroup=${GROUPS}
 
 OPTIONS_DEFINE=	EMULATOR DEBUG
 EMULATOR_DESC=	Build for use with the tpm-emulator
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MEMULATOR}
 PKGNAMESUFFIX+=	-no_tddl
 LIB_DEPENDS+=	tddl.1:${PORTSDIR}/emulators/tpm-emulator
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|$${top_builddir}/src/tddl/libtddl.a|${LOCALBASE}/lib/libtddl.a|' \
 			${WRKSRC}/src/tcs/Makefile.am \
 			${WRKSRC}/src/tcsd/Makefile.am
 	@${REINPLACE_CMD} -e \
 		's|libtddl\.a||g' \
 			${WRKSRC}/src/tddl/Makefile.am
 
 # The emulator has already a libttddl.so, so comment out trousers' libtddl in the pkg-plist
 PLIST_SUB+=	TDDL="@comment "
 .else
 PKGNAMESUFFIX+=	-tddl
 CONFLICTS+=	tpm-emulator-0*
 PLIST_SUB+=	TDDL=""
 .endif
 
 .if ${PORT_OPTIONS:MDEBUG}
 CONFIGURE_ARGS+=--enable-debug
 .endif
 
 run-autotools:	run-autotools-autoreconf
 
 run-autotools-autoreconf:
 	@cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTORECONF} -i
 
 post-install:
 	@${MKDIR} ${EXAMPLESDIR}
 	@${INSTALL_DATA} -o ${USERS} -g ${GROUPS} -m 0600 \
 		${WRKSRC}/dist/tcsd.conf ${EXAMPLESDIR}/tcsd.conf
 	@[ -f ${PREFIX}/etc/tcsd.conf ] || \
 		${CP} -p ${EXAMPLESDIR}/tcsd.conf ${PREFIX}/etc/tcsd.conf
 	@${INSTALL} -d -o ${USERS} -g ${GROUPS} -m 0700 /var/run/tpm
 	@${INSTALL} -d -o ${USERS} -g ${GROUPS} -m 0700 /var/run/ima
 	@${INSTALL} -d -o ${USERS} -g ${GROUPS} -m 0700 ${PREFIX}/var/lib/tpm
 	@${CAT} ${PKGMESSAGE}
 
 add-plist-post:
 	@${ECHO_CMD} "@cwd /"								>> ${TMPPLIST}
 	@${ECHO_CMD} "@unexec ${RMDIR} var/run/tpm 2>/dev/null || true"			>> ${TMPPLIST}
 	@${ECHO_CMD} "@exec ${INSTALL} -d -o ${USERS} -g ${GROUPS} -m 0700 var/run/tpm"	>> ${TMPPLIST}
 	@${ECHO_CMD} "@unexec ${RMDIR} var/run/ima 2>/dev/null || true"			>> ${TMPPLIST}
 	@${ECHO_CMD} "@exec ${INSTALL} -d -o ${USERS} -g ${GROUPS} -m 0700 var/run/ima"	>> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/security/trousers/pkg-descr b/security/trousers/pkg-descr
index 087ba6dfa1b4..7c212c6b231c 100644
--- a/security/trousers/pkg-descr
+++ b/security/trousers/pkg-descr
@@ -1,2 +1,4 @@
 TrouSerS is an CPL (Common Public License) licensed Trusted Computing
 Software Stack. It is mostly compliant with the TSS 1.2 specification.
+
+WWW: http://sourceforge.net/projects/trousers
diff --git a/security/trousers/pkg-plist b/security/trousers/pkg-plist
index 8cf41059b7e0..da346fdf4e73 100644
--- a/security/trousers/pkg-plist
+++ b/security/trousers/pkg-plist
@@ -1,40 +1,41 @@
+@comment $FreeBSD$
 @unexec cmp -s %D/etc/tcsd.conf %D/%%EXAMPLESDIR%%/tcsd.conf && rm -f %D/etc/tcsd.conf || true
 %%EXAMPLESDIR%%/tcsd.conf
 @exec [ -f %D/etc/tcsd.conf ] || cp -p %B/%f %D/etc/tcsd.conf
 include/trousers/trousers.h
 include/trousers/tss.h
 include/tss/compat11b.h
 include/tss/platform.h
 include/tss/tcpa_defines.h
 include/tss/tcpa_error.h
 include/tss/tcpa_struct.h
 include/tss/tcpa_typedef.h
 include/tss/tcs.h
 include/tss/tcs_defines.h
 include/tss/tcs_error.h
 include/tss/tcs_structs.h
 include/tss/tcs_typedef.h
 include/tss/tddl_error.h
 include/tss/tddlapi_error.h
 include/tss/tddli.h
 include/tss/tpm.h
 include/tss/tpm_error.h
 include/tss/tpm_ordinal.h
 include/tss/tspi.h
 include/tss/tss_defines.h
 include/tss/tss_error.h
 include/tss/tss_error_basics.h
 include/tss/tss_structs.h
 include/tss/tss_typedef.h
 %%TDDL%%lib/libtddl.a
 lib/libtspi.a
 lib/libtspi.la
 lib/libtspi.so
 lib/libtspi.so.2
 sbin/tcsd
 @dirrm %%EXAMPLESDIR%%
 @dirrmtry var/lib/tpm
 @dirrmtry var/lib
 @dirrmtry var
 @dirrm include/tss
 @dirrm include/trousers