diff --git a/www/tdom/Makefile b/www/tdom/Makefile
index 834758ee8936..b2736dbf6856 100644
--- a/www/tdom/Makefile
+++ b/www/tdom/Makefile
@@ -14,7 +14,7 @@ TDOMBASE=	${PREFIX}/lib/tdom${PORTVERSION}
 
 OPTIONS_DEFINE=	DOCS
 
-USES=		gmake tcl tar:tgz
+USES=		gmake tar:tgz tcl
 USE_GITHUB=	yes
 GH_PROJECT=	tdom
 
@@ -34,24 +34,22 @@ HTMLDOCS=	category-index.html dom.html domDoc.html domNode.html \
 post-build test:
 	${SETENV} LANG=C ${MAKE} -C ${WRKSRC} test
 
-.include <bsd.port.options.mk>
-
 CONFIGURE_ARGS+=--enable-threads --disable-tdomalloc \
 		--with-tcl=${TCL_LIBDIR} \
 		--with-tclinclude=${TCL_INCLUDEDIR} \
 		--prefix=${PREFIX} --exec-prefix=${PREFIX}
 
 post-install:
-	chmod 755 ${STAGEDIR}${TDOMBASE}
-	chmod 644 ${STAGEDIR}${TDOMBASE}/*
-.if ${PORT_OPTIONS:MDOCS}
+	${CHMOD} 755 ${STAGEDIR}${TDOMBASE}
+	${CHMOD} 644 ${STAGEDIR}${TDOMBASE}/*
+
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/html
-. for FILE in ${DOCS}
-	@${INSTALL_DATA} ${WRKSRC}/../${FILE} ${STAGEDIR}${DOCSDIR}/${FILE}
-. endfor
-. for FILE in ${HTMLDOCS}
-	@${INSTALL_DATA} ${WRKSRC}/../doc/${FILE} ${STAGEDIR}${DOCSDIR}/html/${FILE}
-. endfor
-.endif
+.for FILE in ${DOCS}
+	${INSTALL_DATA} ${WRKSRC}/../${FILE} ${STAGEDIR}${DOCSDIR}/${FILE}
+.endfor
+.for FILE in ${HTMLDOCS}
+	${INSTALL_DATA} ${WRKSRC}/../doc/${FILE} ${STAGEDIR}${DOCSDIR}/html/${FILE}
+.endfor
 
 .include <bsd.port.mk>
diff --git a/www/tdom/pkg-descr b/www/tdom/pkg-descr
index d40b535498de..4f49bb38b314 100644
--- a/www/tdom/pkg-descr
+++ b/www/tdom/pkg-descr
@@ -7,5 +7,5 @@ recommendation in XML (160K) needs only about 450K in memory)!
 
 Configured for OpenACS (http://openacs.org)
 
-WWW:	http://wiki.tcl.tk/1948
-	http://tdom.github.com/
+WWW: http://wiki.tcl.tk/1948
+     http://tdom.github.com/