diff --git a/UPDATING b/UPDATING
index eb96e6a4ebbe..e6cace91361e 100644
--- a/UPDATING
+++ b/UPDATING
@@ -6,6 +6,36 @@ You should get into the habit of checking this file for changes each
 time you update your ports collection, before attempting any port
 upgrades.
 
+20060313:
+  AFFECTS: users of multimedia/vcdimager and security/dirmngr
+  AUTHOR: nork@FreeBSD.org
+
+  These versions of the ports which have been installed in your
+  system accidentally installed some malformed entries to
+  $LOCALBASE/info/dir, which prevent them from being upgraded
+  to the latest versions.  Please remove the following entries
+  manually from $LOCALBASE/info/dir before upgrading them to
+  vcdimager-0.7.23_2 (and later) and dirmngr-0.9.3_2 (and later)
+  respectively.
+
+  multimedia/vcdimager
+  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+  * VCDImager: (vcdimager).           GNU Video CD imaging utilities
+  * cdxa2mpeg: (vcdimager)cdxa2mpeg.  Strip RIFF/CD-XA container
+  * vcd-info:  (vcdimager)vcd-info.   Video CD diagnostic tool
+  * vcdimager: (vcdimager)vcdimager.  Video CD simple formatter
+  * vcdxbuild: (vcdimager)vcdxbuild.  Video CD XML formatter
+  * vcdxgen:   (vcdimager)vcdxgen.    Video CD XML template generator
+  * vcdxminfo: (vcdimager)vcdxminfo.  Display MPEG stream properties
+  * vcdxrip:   (vcdxrip).             Video CD Ripping tool
+  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+  security/dirmngr
+  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+  * dirmngr: (gnupg).         X.509 CRL and OCSP server.
+  * dirmngr-client: (gnupg).  X.509 CRL and OCSP client.
+  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
 20060307:
   AFFECTS: users of print/acroread7 and the localized versions
   AUTHOR: hrs@FreeBSD.org
diff --git a/multimedia/vcdimager/Makefile b/multimedia/vcdimager/Makefile
index 97858861bbc7..f2bccc4ed0e6 100644
--- a/multimedia/vcdimager/Makefile
+++ b/multimedia/vcdimager/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	vcdimager
 PORTVERSION=	0.7.23
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	vcdimager
diff --git a/multimedia/vcdimager/files/patch-docs-vcdimager.texi b/multimedia/vcdimager/files/patch-docs-vcdimager.texi
new file mode 100644
index 000000000000..a4053a2d4615
--- /dev/null
+++ b/multimedia/vcdimager/files/patch-docs-vcdimager.texi
@@ -0,0 +1,10 @@
+--- docs/vcdimager.texi.orig	Sat Jun 18 13:11:08 2005
++++ docs/vcdimager.texi	Sun Mar 12 14:57:41 2006
+@@ -61,7 +61,6 @@
+ @direntry
+ * VCDImager: (vcdimager).                       GNU Video CD imaging utilities
+ * vcdimager: (vcdimager)vcdimager.              Video CD simple formatter
+-* vcd-info:  (vcdimager)vcd-info.               Video CD diagnostic tool
+ * cdxa2mpeg: (vcdimager)cdxa2mpeg.              Strip RIFF/CD-XA container
+ * vcdxminfo: (vcdimager)vcdxminfo.              Display MPEG stream properties
+ * vcdxgen: (vcdimager)vcdxgen.                  Video CD XML template generator
diff --git a/security/dirmngr/Makefile b/security/dirmngr/Makefile
index 969e45a9864a..b8375d71271d 100644
--- a/security/dirmngr/Makefile
+++ b/security/dirmngr/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dirmngr
 PORTVERSION=	0.9.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNUPG}
 MASTER_SITE_SUBDIR=	alpha/dirmngr
diff --git a/security/dirmngr/files/patch-doc-dirmngr.texi b/security/dirmngr/files/patch-doc-dirmngr.texi
new file mode 100644
index 000000000000..1d9c8a1d9342
--- /dev/null
+++ b/security/dirmngr/files/patch-doc-dirmngr.texi
@@ -0,0 +1,13 @@
+--- doc/dirmngr.texi.orig	Sat Sep  3 19:46:41 2005
++++ doc/dirmngr.texi	Sun Mar 12 14:55:51 2006
+@@ -32,8 +32,8 @@
+ 
+ @dircategory GNU Utilities
+ @direntry
+-* dirmngr: (gnupg).        X.509 CRL and OCSP server.
+-* dirmngr-client: (gnupg). X.509 CRL and OCSP client.
++* dirmngr: (dirmngr).        X.509 CRL and OCSP server.
++* dirmngr-client: (dirmngr). X.509 CRL and OCSP client.
+ @end direntry
+ 
+ @c