diff --git a/textproc/htmldoc/Makefile b/textproc/htmldoc/Makefile
index 86d959563287..70c738b768ea 100644
--- a/textproc/htmldoc/Makefile
+++ b/textproc/htmldoc/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	htmldoc
-PORTVERSION=	1.8.20
+PORTVERSION=	1.8.23
 CATEGORIES=	textproc
-MASTER_SITES=	ftp://ftp.easysw.com/pub/htmldoc/%SUBDIR%/
-MASTER_SITE_SUBDIR=	${PORTVERSION}
-DISTNAME=	${PORTNAME}-${PORTVERSION}-1-source
+MASTER_SITES=	ftp://ftp.easysw.com/pub/htmldoc/htmldoc/
+DISTNAME=	${PORTNAME}-${PORTVERSION}-source
 
 MAINTAINER=	glenn@trewitt.org
 
diff --git a/textproc/htmldoc/distinfo b/textproc/htmldoc/distinfo
index 96498f2ca600..a8e4f5914c7f 100644
--- a/textproc/htmldoc/distinfo
+++ b/textproc/htmldoc/distinfo
@@ -1 +1 @@
-MD5 (htmldoc-1.8.20-1-source.tar.gz) = 5a25bb72cc94c17160789fa86c763ceb
+MD5 (htmldoc-1.8.23-source.tar.gz) = bd2478f6ed6ffd7dd0a8631ed73bdec6
diff --git a/textproc/htmldoc/files/patch-fonts:Makefile b/textproc/htmldoc/files/patch-fonts:Makefile
deleted file mode 100644
index 1878c4635956..000000000000
--- a/textproc/htmldoc/files/patch-fonts:Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
---- fonts/Makefile.orig	Sat Jun 29 23:31:10 2002
-+++ fonts/Makefile	Sat Jun 29 23:31:32 2002
-@@ -46,9 +46,7 @@
- 		Times-Bold \
- 		Times-BoldItalic \
- 		Times-Italic \
--		Times-Roman \
--		ZapfChancery \
--		ZapfDingbats
-+		Times-Roman 
- 
- 
- #
diff --git a/textproc/htmldoc/pkg-plist b/textproc/htmldoc/pkg-plist
index ec7eacd0c724..b4283605079d 100644
--- a/textproc/htmldoc/pkg-plist
+++ b/textproc/htmldoc/pkg-plist
@@ -27,6 +27,16 @@ share/htmldoc/fonts/Times-Italic.afm
 share/htmldoc/fonts/Times-Italic.pfa
 share/htmldoc/fonts/Times-Roman.afm
 share/htmldoc/fonts/Times-Roman.pfa
+share/htmldoc/data/cp-1250
+share/htmldoc/data/cp-874
+share/htmldoc/data/cp-1258
+share/htmldoc/data/cp-1257
+share/htmldoc/data/cp-1256
+share/htmldoc/data/cp-1255
+share/htmldoc/data/cp-1254
+share/htmldoc/data/cp-1253
+share/htmldoc/data/cp-1252
+share/htmldoc/data/cp-1251
 share/htmldoc/data/iso-8859-1
 share/htmldoc/data/iso-8859-2
 share/htmldoc/data/iso-8859-3