diff --git a/devel/happydoc/Makefile b/devel/happydoc/Makefile
index 6cc6b819204d..f316250e9ad6 100644
--- a/devel/happydoc/Makefile
+++ b/devel/happydoc/Makefile
@@ -7,17 +7,17 @@
 #
 
 PORTNAME=	happydoc
-PORTVERSION=	1.5
+PORTVERSION=	1.6.1
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	HappyDoc_r${PORTVERSION:S/./_/}
+DISTNAME=	HappyDoc_r${PORTVERSION:S/./_/g}
 
-MAINTAINER=	ijliao@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
 USE_PYTHON=	yes
 
-WRKSRC=	${WRKDIR}/${DISTNAME:S/_r/-r/}
+WRKSRC=		${WRKDIR}/${DISTNAME:S/_r/-r/}
 SETUP_CMD=	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} setup.py
 
 do-build:
diff --git a/devel/happydoc/distinfo b/devel/happydoc/distinfo
index 5976cc3d6f42..9c3afebc9ff5 100644
--- a/devel/happydoc/distinfo
+++ b/devel/happydoc/distinfo
@@ -1 +1 @@
-MD5 (HappyDoc_r1_5.tar.gz) = 4408dcf2075f09561933f85b6c86cefc
+MD5 (HappyDoc_r1_6_1.tar.gz) = 936ce89bf48c0e33f65c8b36cf82500c
diff --git a/devel/happydoc/pkg-plist b/devel/happydoc/pkg-plist
index 631fcdcfc10f..0c248856e88b 100644
--- a/devel/happydoc/pkg-plist
+++ b/devel/happydoc/pkg-plist
@@ -2,24 +2,86 @@ bin/happydoc
 lib/%%PYTHON_VERSION%%/site-packages/happydoc.pth
 lib/%%PYTHON_VERSION%%/site-packages/happydoc/CommandLineApp.py
 lib/%%PYTHON_VERSION%%/site-packages/happydoc/CommandLineApp.pyc
-lib/%%PYTHON_VERSION%%/site-packages/happydoc/MML.py
-lib/%%PYTHON_VERSION%%/site-packages/happydoc/MML.pyc
-lib/%%PYTHON_VERSION%%/site-packages/happydoc/StructuredText.py
-lib/%%PYTHON_VERSION%%/site-packages/happydoc/StructuredText.pyc
 lib/%%PYTHON_VERSION%%/site-packages/happydoc/cvsversion.py
 lib/%%PYTHON_VERSION%%/site-packages/happydoc/cvsversion.pyc
 lib/%%PYTHON_VERSION%%/site-packages/happydoc/debug_happydoc.py
 lib/%%PYTHON_VERSION%%/site-packages/happydoc/debug_happydoc.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoc/docset/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/happydoc/docset/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoc/docset/docset_dia.py
+lib/%%PYTHON_VERSION%%/site-packages/happydoc/docset/docset_dia.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoc/docset/docset_multiplefile.py
+lib/%%PYTHON_VERSION%%/site-packages/happydoc/docset/docset_multiplefile.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoc/docset/docset_singlefile.py
+lib/%%PYTHON_VERSION%%/site-packages/happydoc/docset/docset_singlefile.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoc/docset/docset_stdout.py
+lib/%%PYTHON_VERSION%%/site-packages/happydoc/docset/docset_stdout.pyc
 lib/%%PYTHON_VERSION%%/site-packages/happydoc/guitest_happydoc.py
 lib/%%PYTHON_VERSION%%/site-packages/happydoc/guitest_happydoc.pyc
-lib/%%PYTHON_VERSION%%/site-packages/happydoc/happydocset.py
-lib/%%PYTHON_VERSION%%/site-packages/happydoc/happydocset.pyc
-lib/%%PYTHON_VERSION%%/site-packages/happydoc/happydocwin.py
-lib/%%PYTHON_VERSION%%/site-packages/happydoc/happydocwin.pyc
 lib/%%PYTHON_VERSION%%/site-packages/happydoc/happydoc_class.py
 lib/%%PYTHON_VERSION%%/site-packages/happydoc/happydoc_class.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoc/happydocset.py
+lib/%%PYTHON_VERSION%%/site-packages/happydoc/happydocset.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoc/happydocstring.py
+lib/%%PYTHON_VERSION%%/site-packages/happydoc/happydocstring.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoc/happydocwin.py
+lib/%%PYTHON_VERSION%%/site-packages/happydoc/happydocwin.pyc
 lib/%%PYTHON_VERSION%%/site-packages/happydoc/happyformatter.py
 lib/%%PYTHON_VERSION%%/site-packages/happydoc/happyformatter.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoc/hddocstring/MML.py
+lib/%%PYTHON_VERSION%%/site-packages/happydoc/hddocstring/MML.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoc/hddocstring/StructuredText/ClassicDocumentClass.py
+lib/%%PYTHON_VERSION%%/site-packages/happydoc/hddocstring/StructuredText/ClassicDocumentClass.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoc/hddocstring/StructuredText/ClassicStructuredText.py
+lib/%%PYTHON_VERSION%%/site-packages/happydoc/hddocstring/StructuredText/ClassicStructuredText.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoc/hddocstring/StructuredText/DocBookClass.py
+lib/%%PYTHON_VERSION%%/site-packages/happydoc/hddocstring/StructuredText/DocBookClass.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoc/hddocstring/StructuredText/DocumentClass.py
+lib/%%PYTHON_VERSION%%/site-packages/happydoc/hddocstring/StructuredText/DocumentClass.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoc/hddocstring/StructuredText/DocumentWithImages.py
+lib/%%PYTHON_VERSION%%/site-packages/happydoc/hddocstring/StructuredText/DocumentWithImages.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoc/hddocstring/StructuredText/HTMLClass.py
+lib/%%PYTHON_VERSION%%/site-packages/happydoc/hddocstring/StructuredText/HTMLClass.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoc/hddocstring/StructuredText/HTMLWithImages.py
+lib/%%PYTHON_VERSION%%/site-packages/happydoc/hddocstring/StructuredText/HTMLWithImages.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoc/hddocstring/StructuredText/ST.py
+lib/%%PYTHON_VERSION%%/site-packages/happydoc/hddocstring/StructuredText/ST.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoc/hddocstring/StructuredText/STDOM.py
+lib/%%PYTHON_VERSION%%/site-packages/happydoc/hddocstring/StructuredText/STDOM.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoc/hddocstring/StructuredText/STletters.py
+lib/%%PYTHON_VERSION%%/site-packages/happydoc/hddocstring/StructuredText/STletters.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoc/hddocstring/StructuredText/StructuredText.py
+lib/%%PYTHON_VERSION%%/site-packages/happydoc/hddocstring/StructuredText/StructuredText.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoc/hddocstring/StructuredText/Zwiki.py
+lib/%%PYTHON_VERSION%%/site-packages/happydoc/hddocstring/StructuredText/Zwiki.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoc/hddocstring/StructuredText/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/happydoc/hddocstring/StructuredText/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoc/hddocstring/StructuredText/ts_regex.py
+lib/%%PYTHON_VERSION%%/site-packages/happydoc/hddocstring/StructuredText/ts_regex.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoc/hddocstring/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/happydoc/hddocstring/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoc/hddocstring/hddocstring_classicstructuredtext.py
+lib/%%PYTHON_VERSION%%/site-packages/happydoc/hddocstring/hddocstring_classicstructuredtext.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoc/hddocstring/hddocstring_plaintext.py
+lib/%%PYTHON_VERSION%%/site-packages/happydoc/hddocstring/hddocstring_plaintext.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoc/hddocstring/hddocstring_raw.py
+lib/%%PYTHON_VERSION%%/site-packages/happydoc/hddocstring/hddocstring_raw.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoc/hddocstring/hddocstring_structuredtext.py
+lib/%%PYTHON_VERSION%%/site-packages/happydoc/hddocstring/hddocstring_structuredtext.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoc/hdformatter/__init__.py
+lib/%%PYTHON_VERSION%%/site-packages/happydoc/hdformatter/__init__.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoc/hdformatter/hdformatter_dia.py
+lib/%%PYTHON_VERSION%%/site-packages/happydoc/hdformatter/hdformatter_dia.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoc/hdformatter/hdformatter_docbook.py
+lib/%%PYTHON_VERSION%%/site-packages/happydoc/hdformatter/hdformatter_docbook.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoc/hdformatter/hdformatter_file.py
+lib/%%PYTHON_VERSION%%/site-packages/happydoc/hdformatter/hdformatter_file.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoc/hdformatter/hdformatter_htmlfile.py
+lib/%%PYTHON_VERSION%%/site-packages/happydoc/hdformatter/hdformatter_htmlfile.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoc/hdformatter/hdformatter_null.py
+lib/%%PYTHON_VERSION%%/site-packages/happydoc/hdformatter/hdformatter_null.pyc
+lib/%%PYTHON_VERSION%%/site-packages/happydoc/hdformatter/hdformatter_textfile.py
+lib/%%PYTHON_VERSION%%/site-packages/happydoc/hdformatter/hdformatter_textfile.pyc
 lib/%%PYTHON_VERSION%%/site-packages/happydoc/hdpath.py
 lib/%%PYTHON_VERSION%%/site-packages/happydoc/hdpath.pyc
 lib/%%PYTHON_VERSION%%/site-packages/happydoc/indentstring.py
@@ -36,28 +98,8 @@ lib/%%PYTHON_VERSION%%/site-packages/happydoc/profile_happydoc.py
 lib/%%PYTHON_VERSION%%/site-packages/happydoc/profile_happydoc.pyc
 lib/%%PYTHON_VERSION%%/site-packages/happydoc/test_happydoc.py
 lib/%%PYTHON_VERSION%%/site-packages/happydoc/test_happydoc.pyc
-lib/%%PYTHON_VERSION%%/site-packages/happydoc/ts_regex.py
-lib/%%PYTHON_VERSION%%/site-packages/happydoc/ts_regex.pyc
-lib/%%PYTHON_VERSION%%/site-packages/happydoc/docset/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/happydoc/docset/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/happydoc/docset/docset_multiplefile.py
-lib/%%PYTHON_VERSION%%/site-packages/happydoc/docset/docset_multiplefile.pyc
-lib/%%PYTHON_VERSION%%/site-packages/happydoc/docset/docset_singlefile.py
-lib/%%PYTHON_VERSION%%/site-packages/happydoc/docset/docset_singlefile.pyc
-lib/%%PYTHON_VERSION%%/site-packages/happydoc/docset/docset_stdout.py
-lib/%%PYTHON_VERSION%%/site-packages/happydoc/docset/docset_stdout.pyc
-lib/%%PYTHON_VERSION%%/site-packages/happydoc/hdformatter/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/happydoc/hdformatter/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/happydoc/hdformatter/hdformatter_docbook.py
-lib/%%PYTHON_VERSION%%/site-packages/happydoc/hdformatter/hdformatter_docbook.pyc
-lib/%%PYTHON_VERSION%%/site-packages/happydoc/hdformatter/hdformatter_file.py
-lib/%%PYTHON_VERSION%%/site-packages/happydoc/hdformatter/hdformatter_file.pyc
-lib/%%PYTHON_VERSION%%/site-packages/happydoc/hdformatter/hdformatter_htmlfile.py
-lib/%%PYTHON_VERSION%%/site-packages/happydoc/hdformatter/hdformatter_htmlfile.pyc
-lib/%%PYTHON_VERSION%%/site-packages/happydoc/hdformatter/hdformatter_null.py
-lib/%%PYTHON_VERSION%%/site-packages/happydoc/hdformatter/hdformatter_null.pyc
-lib/%%PYTHON_VERSION%%/site-packages/happydoc/hdformatter/hdformatter_textfile.py
-lib/%%PYTHON_VERSION%%/site-packages/happydoc/hdformatter/hdformatter_textfile.pyc
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/happydoc/docset
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/happydoc/hddocstring/StructuredText
+@dirrm lib/%%PYTHON_VERSION%%/site-packages/happydoc/hddocstring
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/happydoc/hdformatter
 @dirrm lib/%%PYTHON_VERSION%%/site-packages/happydoc