diff --git a/deskutils/ljcharm/Makefile b/deskutils/ljcharm/Makefile
index 9de9fc72e67e..97fbe123ddaf 100644
--- a/deskutils/ljcharm/Makefile
+++ b/deskutils/ljcharm/Makefile
@@ -1,29 +1,31 @@
 # Ports collection Makefile for:	ljcharm
 # Date created:				2003-02-26
 # Whom:					schmidtcarl@earthlink.net
 #
 # $FreeBSD$
 #
 
 PORTNAME=	charm
-PORTVERSION=	1.5.0
+PORTVERSION=	1.6.0
 CATEGORIES=	deskutils net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	ljcharm
 
 MAINTAINER=	seawolf@marinewolf.net
 COMMENT=	A menu-driven python-based livejournal client
 
+MAN1=charm.1
+MAN5=charmrc.5
+
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 
 post-install:
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/CHANGES.charm ${DOCSDIR}/CHANGES
 	${INSTALL_DATA} ${WRKSRC}/README.charm ${DOCSDIR}/README
 	@${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/sample.charmrc ${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/deskutils/ljcharm/distinfo b/deskutils/ljcharm/distinfo
index 074a761b6e9c..ac886aac90ce 100644
--- a/deskutils/ljcharm/distinfo
+++ b/deskutils/ljcharm/distinfo
@@ -1,2 +1,2 @@
-MD5 (charm-1.5.0.tar.gz) = f96dd3d70e5dba264ee666d83fd2874b
-SIZE (charm-1.5.0.tar.gz) = 34866
+MD5 (charm-1.6.0.tar.gz) = e91e7a12b0eb3dd0fce400790fd8a972
+SIZE (charm-1.6.0.tar.gz) = 60226
diff --git a/deskutils/ljcharm/files/patch-setup.py b/deskutils/ljcharm/files/patch-setup.py
new file mode 100644
index 000000000000..3e9d79f76886
--- /dev/null
+++ b/deskutils/ljcharm/files/patch-setup.py
@@ -0,0 +1,12 @@
+--- ./setup.py	Fri Jun 24 15:10:27 2005
++++ ./setup.py.update	Fri Jun 24 15:12:28 2005
+@@ -8,6 +8,6 @@
+       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"]),
++                     ("man/man1", ["charm.1"]),
++                     ("man/man5", ["charmrc.5"]) ] )
diff --git a/deskutils/ljcharm/pkg-plist b/deskutils/ljcharm/pkg-plist
index 1b37ea233a0a..3a71d26393b7 100644
--- a/deskutils/ljcharm/pkg-plist
+++ b/deskutils/ljcharm/pkg-plist
@@ -1,9 +1,10 @@
 bin/charm
 %%PYTHON_SITELIBDIR%%/ljcharm.py
 %%PYTHON_SITELIBDIR%%/ljcharm.pyc
 %%PYTHON_SITELIBDIR%%/ljcharm.pyo
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/charm.html
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%EXAMPLESDIR%%/sample.charmrc
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%