diff --git a/sysutils/mkisofs-devel/Makefile b/sysutils/mkisofs-devel/Makefile
index ff332084d4a0..2d3420d31cfe 100644
--- a/sysutils/mkisofs-devel/Makefile
+++ b/sysutils/mkisofs-devel/Makefile
@@ -1,15 +1,16 @@
-# New ports collection makefile for:    mkisofs
-# Version required:     1.11.1
-# Date created:         07 Aug 1996
-# Whom:                 jkh
+# New ports collection makefile for:	mkisofs
+# Version required:	1.12b4
+# Date created:		07 Aug 1996
+# Whom:			jhk
 #
-# $Id: Makefile,v 1.9 1999/02/22 16:09:52 dirk Exp $
+# $Id: Makefile,v 1.10 1999/02/23 16:18:44 dirk Exp $
 #
 
-DISTNAME=       mkisofs-1.11.3
+DISTNAME=	mkisofs-1.12b4
 CATEGORIES=	sysutils
-MASTER_SITES=   ftp://ftp.cdrom.com/pub/linux/tsx-11/packages/mkisofs/ \
-		ftp://ftp.fokus.gmd.de/pub/unix/cdrecord/mkisofs/
+MASTER_SITES=	ftp://ftp.fokus.gmd.de/pub/unix/cdrecord/mkisofs/ \
+		ftp://ftp.gwdg.de/pub/linux/misc/cdrecord/mkisofs/ \
+		ftp://ftp.cs.tu-berlin.de/pub/misc/cdrecord/mkisofs/
 
 MAINTAINER=	dirk@FreeBSD.ORG
 
diff --git a/sysutils/mkisofs-devel/distinfo b/sysutils/mkisofs-devel/distinfo
index dc5465dce494..ad9ea6d1a177 100644
--- a/sysutils/mkisofs-devel/distinfo
+++ b/sysutils/mkisofs-devel/distinfo
@@ -1 +1 @@
-MD5 (mkisofs-1.11.3.tar.gz) = 6ac09ac298401a900fb37534888c16fb
+MD5 (mkisofs-1.12b4.tar.gz) = c6b71ab4d723be532c52e65b6f505995
diff --git a/sysutils/mkisofs-devel/files/patch-ac b/sysutils/mkisofs-devel/files/patch-ac
deleted file mode 100644
index b0ca127e41a8..000000000000
--- a/sysutils/mkisofs-devel/files/patch-ac
+++ /dev/null
@@ -1,31 +0,0 @@
---- name.c.orig	Sat Mar 15 04:02:46 1997
-+++ name.c	Mon Apr 28 11:50:47 1997
-@@ -57,6 +57,7 @@
-   const char	* pnt;
-   int		  priority	   = 32767;
-   char		* result;
-+  char		* copy;
-   int		  seen_dot	   = 0;
-   int		  seen_semic	   = 0;
-   int		  tildes	   = 0;
-@@ -104,12 +105,17 @@
-   last_dot = strrchr (pnt,'.');
-   if(    (last_dot != NULL)
-       && (    (last_dot[1] == '~')
--	   || (last_dot[1] == '\0')
- 	   || (last_dot[1] == '\0')) )
-     {
-+      /*
-+       * We gotta copy the string first, to work around its constness.
-+       */
-+      copy = alloca (strlen(name) + 1);
-+      memcpy (copy, name, strlen(name) + 1);
-+      pnt = copy;
-+      last_dot = strrchr (pnt,'.');
-       c = last_dot;
-       *c = '\0';
-       last_dot = strrchr (pnt,'.');
--      *c = '.';
-     }
- 
-   while(*pnt)
diff --git a/sysutils/mkisofs/Makefile b/sysutils/mkisofs/Makefile
index ff332084d4a0..2d3420d31cfe 100644
--- a/sysutils/mkisofs/Makefile
+++ b/sysutils/mkisofs/Makefile
@@ -1,15 +1,16 @@
-# New ports collection makefile for:    mkisofs
-# Version required:     1.11.1
-# Date created:         07 Aug 1996
-# Whom:                 jkh
+# New ports collection makefile for:	mkisofs
+# Version required:	1.12b4
+# Date created:		07 Aug 1996
+# Whom:			jhk
 #
-# $Id: Makefile,v 1.9 1999/02/22 16:09:52 dirk Exp $
+# $Id: Makefile,v 1.10 1999/02/23 16:18:44 dirk Exp $
 #
 
-DISTNAME=       mkisofs-1.11.3
+DISTNAME=	mkisofs-1.12b4
 CATEGORIES=	sysutils
-MASTER_SITES=   ftp://ftp.cdrom.com/pub/linux/tsx-11/packages/mkisofs/ \
-		ftp://ftp.fokus.gmd.de/pub/unix/cdrecord/mkisofs/
+MASTER_SITES=	ftp://ftp.fokus.gmd.de/pub/unix/cdrecord/mkisofs/ \
+		ftp://ftp.gwdg.de/pub/linux/misc/cdrecord/mkisofs/ \
+		ftp://ftp.cs.tu-berlin.de/pub/misc/cdrecord/mkisofs/
 
 MAINTAINER=	dirk@FreeBSD.ORG
 
diff --git a/sysutils/mkisofs/distinfo b/sysutils/mkisofs/distinfo
index dc5465dce494..ad9ea6d1a177 100644
--- a/sysutils/mkisofs/distinfo
+++ b/sysutils/mkisofs/distinfo
@@ -1 +1 @@
-MD5 (mkisofs-1.11.3.tar.gz) = 6ac09ac298401a900fb37534888c16fb
+MD5 (mkisofs-1.12b4.tar.gz) = c6b71ab4d723be532c52e65b6f505995
diff --git a/sysutils/mkisofs/files/patch-ac b/sysutils/mkisofs/files/patch-ac
deleted file mode 100644
index b0ca127e41a8..000000000000
--- a/sysutils/mkisofs/files/patch-ac
+++ /dev/null
@@ -1,31 +0,0 @@
---- name.c.orig	Sat Mar 15 04:02:46 1997
-+++ name.c	Mon Apr 28 11:50:47 1997
-@@ -57,6 +57,7 @@
-   const char	* pnt;
-   int		  priority	   = 32767;
-   char		* result;
-+  char		* copy;
-   int		  seen_dot	   = 0;
-   int		  seen_semic	   = 0;
-   int		  tildes	   = 0;
-@@ -104,12 +105,17 @@
-   last_dot = strrchr (pnt,'.');
-   if(    (last_dot != NULL)
-       && (    (last_dot[1] == '~')
--	   || (last_dot[1] == '\0')
- 	   || (last_dot[1] == '\0')) )
-     {
-+      /*
-+       * We gotta copy the string first, to work around its constness.
-+       */
-+      copy = alloca (strlen(name) + 1);
-+      memcpy (copy, name, strlen(name) + 1);
-+      pnt = copy;
-+      last_dot = strrchr (pnt,'.');
-       c = last_dot;
-       *c = '\0';
-       last_dot = strrchr (pnt,'.');
--      *c = '.';
-     }
- 
-   while(*pnt)