diff --git a/textproc/xhtml-11/Makefile b/textproc/xhtml-11/Makefile
index 8ee952bbf90c..812e1ad4dec3 100644
--- a/textproc/xhtml-11/Makefile
+++ b/textproc/xhtml-11/Makefile
@@ -3,19 +3,20 @@
PORTNAME= xhtml
PORTVERSION= 1.1.${RECDATE}
-PORTREVISION= 2
CATEGORIES= textproc
-MASTER_SITES= http://www.w3.org/TR/2007/WD-xhtml11-${RECDATE}/
-DISTNAME= xhtml11
+MASTER_SITES= http://www.w3.org/TR/2010/REC-xhtml11-${RECDATE}/
PKGNAMESUFFIX= -11
-EXTRACT_SUFX= .tgz
+DISTNAME= xhtml11
+DIST_SUBDIR= ${DISTNAME}-${RECDATE}
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= mandree@FreeBSD.org
COMMENT= W3C's XHTML 1.1 DTD
RUN_DEPENDS= ${XMLCATMGR}:textproc/xmlcatmgr
-RECDATE= 20070216
+USES= tar:tgz
+
+RECDATE= 20101123
WRKSRC= ${WRKDIR}/xhtml11-${RECDATE}
NO_BUILD= yes
diff --git a/textproc/xhtml-11/distinfo b/textproc/xhtml-11/distinfo
index f07825cf2ea2..4d72c2100581 100644
--- a/textproc/xhtml-11/distinfo
+++ b/textproc/xhtml-11/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xhtml11.tgz) = 9ff808fcb264ca2c13d540194cdd2286d1cdd7c346e622620d2e4c0e39265945
-SIZE (xhtml11.tgz) = 192036
+SHA256 (xhtml11-20101123/xhtml11.tgz) = 87893d097307cbf6b92fda5656ca3bc46536eeb389ab30b99ea95044d54d4d40
+SIZE (xhtml11-20101123/xhtml11.tgz) = 236494
diff --git a/textproc/xhtml-11/pkg-plist b/textproc/xhtml-11/pkg-plist
index a61a36411211..d18b07f2c25f 100644
--- a/textproc/xhtml-11/pkg-plist
+++ b/textproc/xhtml-11/pkg-plist
@@ -1,5 +1,5 @@
-@unexec %%SGMLCAT_RM%%
-@unexec %%XMLCAT_RM%%
+@preunexec %%SGMLCAT_RM%%
+@preunexec %%XMLCAT_RM%%
share/xml/xhtml/1.1/dtd/VERSION
share/xml/xhtml/1.1/dtd/catalog.xml
share/xml/xhtml/1.1/dtd/xhtml11-flat.dtd
@@ -8,8 +8,9 @@ share/xml/xhtml/1.1/dtd/xhtml11.cat
share/xml/xhtml/1.1/dtd/xhtml11.dtd
share/xml/xhtml/1.1/dtd/xml1.dcl
share/xml/xhtml/1.1/dtd/xml1n.dcl
+share/xml/xhtml/1.1/xsd/xhtml-ruby-1.xsd
share/xml/xhtml/1.1/xsd/xhtml11-model-1.xsd
share/xml/xhtml/1.1/xsd/xhtml11-modules-1.xsd
share/xml/xhtml/1.1/xsd/xhtml11.xsd
-@exec %%XMLCAT_ADD%%
-@exec %%SGMLCAT_ADD%%
+@postexec %%XMLCAT_ADD%%
+@postexec %%SGMLCAT_ADD%%