diff --git a/net/charm/Makefile b/net/charm/Makefile
index 7e10c71219f..cfe2fc37d63 100644
--- a/net/charm/Makefile
+++ b/net/charm/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2005/02/23 16:42:41 xsa Exp $
+# $OpenBSD: Makefile,v 1.2 2005/07/01 06:55:49 xsa Exp $
 
 COMMENT=	"LiveJournal client for Python"
 
-DISTNAME=	charm-1.5.0
+DISTNAME=	charm-1.6.0
 CATEGORIES=	net news
 
 HOMEPAGE=	http://ljcharm.sourceforge.net/
@@ -22,12 +22,14 @@ MODULES=	lang/python
 NO_REGRESS=	Yes
 
 DOCSDIR=	${PREFIX}/share/doc/charm
-EXAMPLESDIR=	${PREFIX}/share/examples/charm
+
+post-configure:
+	@perl -pi -e 's|%%PREFIX%%|${PREFIX}|g' \
+		${WRKSRC}/charm.1 \
+		${WRKSRC}/charmrc.5
 
 post-install:
 	${INSTALL_DATA_DIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.charm ${DOCSDIR}/README
-	${INSTALL_DATA_DIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/sample.charmrc ${EXAMPLESDIR}
-
+	
 .include <bsd.port.mk>
diff --git a/net/charm/distinfo b/net/charm/distinfo
index 30fb565c53e..ded12b90cd0 100644
--- a/net/charm/distinfo
+++ b/net/charm/distinfo
@@ -1,4 +1,4 @@
-MD5 (charm-1.5.0.tar.gz) = f96dd3d70e5dba264ee666d83fd2874b
-RMD160 (charm-1.5.0.tar.gz) = 0ec9d4b53d67e8342bc3f3bb2c60f1925964ad9d
-SHA1 (charm-1.5.0.tar.gz) = 4d61ce7a70d353c6f52ad60c0c505d34820f96f1
-SIZE (charm-1.5.0.tar.gz) = 34866
+MD5 (charm-1.6.0.tar.gz) = e91e7a12b0eb3dd0fce400790fd8a972
+RMD160 (charm-1.6.0.tar.gz) = 7bd340ff6b591de7be19050a7744f8d0b2265a8f
+SHA1 (charm-1.6.0.tar.gz) = 51b19e6bece241dcc5d9116674aaf7ea0e56703f
+SIZE (charm-1.6.0.tar.gz) = 60226
diff --git a/net/charm/patches/patch-charm_1 b/net/charm/patches/patch-charm_1
new file mode 100644
index 00000000000..00cc3a20920
--- /dev/null
+++ b/net/charm/patches/patch-charm_1
@@ -0,0 +1,12 @@
+$OpenBSD: patch-charm_1,v 1.1 2005/07/01 06:55:49 xsa Exp $
+--- charm.1.orig	Mon Jun 13 23:20:22 2005
++++ charm.1	Fri Jul  1 08:44:16 2005
+@@ -245,7 +245,7 @@ The default location of the charmrc file
+ 
+ .SH MANUAL
+ There is a full manual for Charm. It can usually be found in
+-.B /usr/share/doc/charm/charm.html
++.B %%PREFIX%%/share/doc/charm/charm.html
+ 
+ .SH SEE ALSO
+ charmrc(5)
diff --git a/net/charm/patches/patch-charmrc_5 b/net/charm/patches/patch-charmrc_5
new file mode 100644
index 00000000000..aaf28bf47c3
--- /dev/null
+++ b/net/charm/patches/patch-charmrc_5
@@ -0,0 +1,17 @@
+$OpenBSD: patch-charmrc_5,v 1.1 2005/07/01 06:55:49 xsa Exp $
+--- charmrc.5.orig	Mon Jun 13 23:20:22 2005
++++ charmrc.5	Fri Jul  1 08:44:03 2005
+@@ -190,11 +190,11 @@ journal, or put all archived posts under
+ 
+ .SH EXAMPLES
+ There is an example charmrc file. It can usually be found in
+-.B /usr/share/doc/charm/sample.charmrc
++.B %%PREFIX%%/share/examples/charm/sample.charmrc
+ 
+ .SH MANUAL
+ There is a full manual for Charm. It can usually be found in
+-.B /usr/share/doc/charm/charm.html
++.B %%PREFIX%%/share/doc/charm/charm.html
+ 
+ .SH SEE ALSO
+ charm(1)
diff --git a/net/charm/patches/patch-setup_py b/net/charm/patches/patch-setup_py
new file mode 100644
index 00000000000..812db6fb468
--- /dev/null
+++ b/net/charm/patches/patch-setup_py
@@ -0,0 +1,14 @@
+$OpenBSD: patch-setup_py,v 1.1 2005/07/01 06:55:49 xsa Exp $
+--- setup.py.orig	Mon Jun 13 23:20:22 2005
++++ setup.py	Fri Jul  1 08:50:53 2005
+@@ -8,6 +8,7 @@ setup(name = "charm",
+       url = "http://ljcharm.sourceforge.net",
+       py_modules = ["ljcharm"],
+       scripts = ["charm"],
+-      data_files = [ ("share/doc/charm", ["charm.html", "sample.charmrc"]),
+-                     ("share/man/man1", ["charm.1"]),
+-                     ("share/man/man5", ["charmrc.5"]) ] )
++      data_files = [ ("share/doc/charm", ["charm.html"]),
++                     ("share/examples/charm", ["sample.charmrc"]), 
++                     ("man/man1", ["charm.1"]),
++                     ("man/man5", ["charmrc.5"]) ] )
diff --git a/net/charm/pkg/PLIST b/net/charm/pkg/PLIST
index c54c49d5358..9c6e1d3e253 100644
--- a/net/charm/pkg/PLIST
+++ b/net/charm/pkg/PLIST
@@ -1,8 +1,11 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2005/02/23 16:42:41 xsa Exp $
+@comment $OpenBSD: PLIST,v 1.2 2005/07/01 06:55:50 xsa Exp $
 bin/charm
 lib/python${MODPY_VERSION}/site-packages/ljcharm.py
 lib/python${MODPY_VERSION}/site-packages/ljcharm.pyc
+@man man/man1/charm.1
+@man man/man5/charmrc.5
 share/doc/charm/
 share/doc/charm/README
+share/doc/charm/charm.html
 share/examples/charm/
 share/examples/charm/sample.charmrc