diff --git a/lang/itcl/Makefile b/lang/itcl/Makefile
index c6f5e5cec056..50542ae4cce8 100644
--- a/lang/itcl/Makefile
+++ b/lang/itcl/Makefile
@@ -29,31 +29,27 @@ PLIST_SUB+=	PORTVERSION=${PORTVERSION} \
 		MAJOR=${PORTVERSION:R:R} \
 		SHORT=${PORTVERSION:R:S/.//}
 
-MANCOMPRESSED=	no
-MANN=		body.itcl class.itcl code.itcl configbody.itcl delete.itcl ensemble.itcl find.itcl \
-		is.itcl itcl.itcl itclvars.itcl local.itcl scope.itcl
-MAN3=		Itcl_RegisterC.3 Itcl_Stack.3 Itcl_Class.3 Itcl_List.3 Itcl_Object.3 Itcl_Preserve.3
-
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
+MAN_3=		Itcl_RegisterC.3 Itcl_Stack.3 Itcl_Class.3 \
+		Itcl_List.3 Itcl_Object.3 Itcl_Preserve.3
 
 post-patch:
 	${REINPLACE_CMD} -E '/^includedir/s|/include|/include/itcl${PORTVERSION:R}|' \
 	    ${WRKSRC}/${CONFIGURE_SCRIPT}
 
 post-build test:
-	cd ${WRKSRC} && ${SETENV} ITCL_LIBRARY=${WRKSRC}/library \
-		${TCLSH} tests/all.tcl -load "load ./libitcl.so.1"
+	(cd ${WRKSRC} && ${SETENV} ITCL_LIBRARY=${WRKSRC}/library \
+		${TCLSH} tests/all.tcl -load "load ./libitcl.so.1")
 
 post-install:
-	${LN} -sf ${PREFIX}/lib/${PORTNAME}${PORTVERSION:R}/libitcl.so.1 \
-	    ${PREFIX}/lib/libitcl.so.${PORTVERSION:R:R}
-	${LN} -sf ${PREFIX}/lib/${PORTNAME}${PORTVERSION:R}/libitcl.so.1 \
-	    ${PREFIX}/lib/${PORTNAME}${PORTVERSION:R}/libitcl${PORTVERSION:R:S/.//}.so
-	${LN} -sf ${PREFIX}/lib/${PORTNAME}${PORTVERSION:R}/libitcl.so.1 \
-	    ${PREFIX}/lib/libitcl.so
-.for FILE in ${MAN3}
-	${INSTALL_DATA} ${WRKSRC}/doc/${FILE:S/Itcl_//} ${PREFIX}/man/man3/${FILE}
+	${LN} -s libitcl.so.1 \
+	    ${STAGEDIR}${PREFIX}/lib/${PORTNAME}${PORTVERSION:R}/libitcl${PORTVERSION:R:S/.//}.so
+	${LN} -s ${PORTNAME}${PORTVERSION:R}/libitcl.so.1 \
+	    ${STAGEDIR}${PREFIX}/lib/libitcl.so.${PORTVERSION:R:R}
+	${LN} -s ${PORTNAME}${PORTVERSION:R}/libitcl.so.1 \
+	    ${STAGEDIR}${PREFIX}/lib/libitcl.so
+
+.for FILE in ${MAN_3}
+	${INSTALL_DATA} ${WRKSRC}/doc/${FILE:S/Itcl_//} ${STAGEDIR}${MAN3PREFIX}/man/man3/${FILE}
 .endfor
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/lang/itcl/pkg-plist b/lang/itcl/pkg-plist
index 01b9055b915e..d64874ebeeb7 100644
--- a/lang/itcl/pkg-plist
+++ b/lang/itcl/pkg-plist
@@ -1,14 +1,32 @@
 include/itcl%%VERSION%%/itcl.h
-include/itcl%%VERSION%%/itclInt.h
 include/itcl%%VERSION%%/itclDecls.h
+include/itcl%%VERSION%%/itclInt.h
 include/itcl%%VERSION%%/itclIntDecls.h
-lib/libitcl.so.%%MAJOR%%
-lib/libitcl.so
-lib/itcl%%VERSION%%/libitcl.so.1
-lib/itcl%%VERSION%%/libitcl%%SHORT%%.so
 lib/itcl%%VERSION%%/itcl.tcl
 lib/itcl%%VERSION%%/itclConfig.sh
+lib/itcl%%VERSION%%/libitcl.so.1
+lib/itcl%%VERSION%%/libitcl%%SHORT%%.so
 lib/itcl%%VERSION%%/libitclstub.a
 lib/itcl%%VERSION%%/pkgIndex.tcl
-@dirrm include/itcl%%VERSION%%
+lib/libitcl.so
+lib/libitcl.so.%%MAJOR%%
+man/man3/Itcl_Class.3.gz
+man/man3/Itcl_List.3.gz
+man/man3/Itcl_Object.3.gz
+man/man3/Itcl_Preserve.3.gz
+man/man3/Itcl_RegisterC.3.gz
+man/man3/Itcl_Stack.3.gz
+man/mann/body.itcl.gz
+man/mann/class.itcl.gz
+man/mann/code.itcl.gz
+man/mann/configbody.itcl.gz
+man/mann/delete.itcl.gz
+man/mann/ensemble.itcl.gz
+man/mann/find.itcl.gz
+man/mann/is.itcl.gz
+man/mann/itcl.itcl.gz
+man/mann/itclvars.itcl.gz
+man/mann/local.itcl.gz
+man/mann/scope.itcl.gz
 @dirrm lib/itcl%%VERSION%%
+@dirrm include/itcl%%VERSION%%