diff --git a/ht2html/Makefile b/ht2html/Makefile
index 656dfd1b45..ff9832666a 100644
--- a/ht2html/Makefile
+++ b/ht2html/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/06/22 13:48:41 marc Exp $
+# $NetBSD: Makefile,v 1.2 2003/06/23 00:10:07 marc Exp $
 #
 
 DISTNAME=		ht2html-2.0
@@ -14,20 +14,30 @@ PY_PATCHPLIST=		yes
 
 PYTHON_PATCH_SCRIPTS=	ht2html.py
 
-DOCDIR=			${PREFIX}/share/doc/html/ht2html
-PAX_SUBST=		-s '/calcroot\.py[co]*//' -s '/ht2html\.py[co]*//'
-PY_PAX=			${PAX} ${PAX_SUBST} -rw -pp -pm
+EGDIR=			${PREFIX}/share/examples/ht2html
+EGFILES=		BAWGenerator.py JPyLocalGenerator.py
+EGFILES+=		IPC8Generator.py PDOGenerator.py
+EGFILES+=		JPyGenerator.py SelfGenerator.py
+
+LIBFILES=		Banner.* HTParser.* LinkFixer.*
+LIBFILES+=		Sidebar.* Skeleton.* StandardGenerator.*
 
 do-build:
 	${PYTHONBIN} ${PREFIX}/${PYLIB}/compileall.py \
-		${WRKSRC}
+		${PY_COMPILE_EXCLUDE} ${WRKSRC}
 	${PYTHONBIN} -O ${PREFIX}/${PYLIB}/compileall.py \
-		${WRKSRC}
+		${PY_COMPILE_EXCLUDE} ${WRKSRC}
 
 do-install:
-	${INSTALL_DATA_DIR} ${DOCDIR}
-	cd ${WRKSRC}/doc && ${PAX} -rw -pp -pm . ${DOCDIR}
-	cd ${WRKSRC} && ${PY_PAX} *.py* ${PREFIX}/${PYSITELIB}
+	${INSTALL_DATA_DIR} ${EGDIR}
+	cd ${WRKSRC}/doc && ${PAX} -rw -pp -pm . ${EGDIR}
+	for egfile in ${EGFILES}; do \
+		${INSTALL_DATA} ${WRKSRC}/$${egfile} ${EGDIR}; \
+	done
+	for libfile in ${LIBFILES}; do \
+		${INSTALL_DATA} ${WRKSRC}/$${libfile} \
+			${PREFIX}/${PYSITELIB}; \
+	done
 	${INSTALL_SCRIPT} ${WRKSRC}/ht2html.py ${PREFIX}/bin
 
 .include "../../lang/python/application.mk"
diff --git a/ht2html/PLIST b/ht2html/PLIST
index 03025dbb46..8e75e79d39 100644
--- a/ht2html/PLIST
+++ b/ht2html/PLIST
@@ -1,32 +1,14 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/06/22 13:48:41 marc Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/06/23 00:10:07 marc Exp $
 bin/ht2html.py
-${PYSITELIB}/BAWGenerator.py
-${PYSITELIB}/BAWGenerator.pyc
-${PYSITELIB}/BAWGenerator.pyo
 ${PYSITELIB}/Banner.py
 ${PYSITELIB}/Banner.pyc
 ${PYSITELIB}/Banner.pyo
 ${PYSITELIB}/HTParser.py
 ${PYSITELIB}/HTParser.pyc
 ${PYSITELIB}/HTParser.pyo
-${PYSITELIB}/IPC8Generator.py
-${PYSITELIB}/IPC8Generator.pyc
-${PYSITELIB}/IPC8Generator.pyo
-${PYSITELIB}/JPyGenerator.py
-${PYSITELIB}/JPyGenerator.pyc
-${PYSITELIB}/JPyGenerator.pyo
-${PYSITELIB}/JPyLocalGenerator.py
-${PYSITELIB}/JPyLocalGenerator.pyc
-${PYSITELIB}/JPyLocalGenerator.pyo
 ${PYSITELIB}/LinkFixer.py
 ${PYSITELIB}/LinkFixer.pyc
 ${PYSITELIB}/LinkFixer.pyo
-${PYSITELIB}/PDOGenerator.py
-${PYSITELIB}/PDOGenerator.pyc
-${PYSITELIB}/PDOGenerator.pyo
-${PYSITELIB}/SelfGenerator.py
-${PYSITELIB}/SelfGenerator.pyc
-${PYSITELIB}/SelfGenerator.pyo
 ${PYSITELIB}/Sidebar.py
 ${PYSITELIB}/Sidebar.pyc
 ${PYSITELIB}/Sidebar.pyo
@@ -36,20 +18,26 @@ ${PYSITELIB}/Skeleton.pyo
 ${PYSITELIB}/StandardGenerator.py
 ${PYSITELIB}/StandardGenerator.pyc
 ${PYSITELIB}/StandardGenerator.pyo
-share/doc/html/ht2html/Makefile
-share/doc/html/ht2html/PythonPoweredSmall.png
-share/doc/html/ht2html/bugs.ht
-share/doc/html/ht2html/bugs.html
-share/doc/html/ht2html/components.ht
-share/doc/html/ht2html/components.html
-share/doc/html/ht2html/docstring.ht
-share/doc/html/ht2html/docstring.html
-share/doc/html/ht2html/examples.ht
-share/doc/html/ht2html/examples.html
-share/doc/html/ht2html/ht2html.png
-share/doc/html/ht2html/index.ht
-share/doc/html/ht2html/index.html
-share/doc/html/ht2html/links.h
-share/doc/html/ht2html/style.ht
-share/doc/html/ht2html/style.html
-@dirrm share/doc/html/ht2html
+share/examples/ht2html/BAWGenerator.py
+share/examples/ht2html/IPC8Generator.py
+share/examples/ht2html/JPyGenerator.py
+share/examples/ht2html/JPyLocalGenerator.py
+share/examples/ht2html/Makefile
+share/examples/ht2html/PDOGenerator.py
+share/examples/ht2html/PythonPoweredSmall.png
+share/examples/ht2html/SelfGenerator.py
+share/examples/ht2html/bugs.ht
+share/examples/ht2html/bugs.html
+share/examples/ht2html/components.ht
+share/examples/ht2html/components.html
+share/examples/ht2html/docstring.ht
+share/examples/ht2html/docstring.html
+share/examples/ht2html/examples.ht
+share/examples/ht2html/examples.html
+share/examples/ht2html/ht2html.png
+share/examples/ht2html/index.ht
+share/examples/ht2html/index.html
+share/examples/ht2html/links.h
+share/examples/ht2html/style.ht
+share/examples/ht2html/style.html
+@dirrm share/examples/ht2html