diff --git a/security/tpmmanager/Makefile b/security/tpmmanager/Makefile
index 60abb0803152..87970d3feb4a 100644
--- a/security/tpmmanager/Makefile
+++ b/security/tpmmanager/Makefile
@@ -6,12 +6,12 @@ PORTVERSION=	0.8.1
 CATEGORIES=	security
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-${PORTVERSION:C/\.1//}/
 
-MAINTAINER=	danilogondolfo@gmail.com
+MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	TPM Manager
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	tspi:${PORTSDIR}/security/trousers
+LIB_DEPENDS=	libtspi.so:${PORTSDIR}/security/trousers
 
 QT_NONSTANDARD=	YES
 USE_QT4=	gui moc_build qmake_build rcc_build uic_build
@@ -19,24 +19,18 @@ USE_QT4=	gui moc_build qmake_build rcc_build uic_build
 HAS_CONFIGURE=	YES
 
 PLIST_FILES=	bin/${PORTNAME}
-
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
 do-configure:
 	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
 		${QMAKE} PREFIX=${PREFIX} tpmmanager.pro
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${PREFIX}/bin/
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/latex/${PORTNAME}.pdf ${DOCSDIR}/
-	${INSTALL_DATA} ${WRKSRC}/doc/TPM_Manager.odt ${DOCSDIR}/
-.endif
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/latex/${PORTNAME}.pdf ${STAGEDIR}${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/doc/TPM_Manager.odt ${STAGEDIR}${DOCSDIR}/
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>