diff --git a/sysutils/cdrecord/Makefile b/sysutils/cdrecord/Makefile
index 04462ae1508a..5bab825a2070 100644
--- a/sysutils/cdrecord/Makefile
+++ b/sysutils/cdrecord/Makefile
@@ -6,18 +6,18 @@
 # $FreeBSD$
 #
 
-DISTNAME=	cdrecord-1.8a22
+DISTNAME=	cdrecord-1.8a28
 CATEGORIES=	sysutils audio
-MASTER_SITES=	ftp://ftp.fokus.gmd.de/pub/unix/cdrecord/alpha/
+MASTER_SITES=	ftp://ftp.fokus.gmd.de/pub/unix/cdrecord/alpha/ \
+		ftp://ftp.cs.tu-berlin.de/pub/misc/cdrecord/alpha/ \
+		ftp://ftp.gwdg.de/pub/linux/misc/cdrecord/alpha/
 
 MAINTAINER=	dirk@FreeBSD.org
 
 WRKSRC=         ${WRKDIR}/cdrecord-1.8
 MAN1=		cdrecord.1 cdda2wav.1
 USE_GMAKE=	yes
-
-do-build:
-	@cd ${WRKSRC} && ${GMAKE} COPTX=-DBSD_SCSI_SENSE_BUG
+MAKE_ENV=	COPTX=-DBSD_SCSI_SENSE_BUG
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/cdrecord/OBJ/i386-freebsd-cc/cdrecord \
diff --git a/sysutils/cdrecord/distinfo b/sysutils/cdrecord/distinfo
index 1dab606ce5f7..1feb8ca4290b 100644
--- a/sysutils/cdrecord/distinfo
+++ b/sysutils/cdrecord/distinfo
@@ -1 +1 @@
-MD5 (cdrecord-1.8a22.tar.gz) = 07b962c800788224e61fced0ad3c331d
+MD5 (cdrecord-1.8a28.tar.gz) = 2df21b533db6ba3a2283eb2a2c3241b3
diff --git a/sysutils/cdrecord/pkg-plist b/sysutils/cdrecord/pkg-plist
index 16c9afc76fd2..9fcbd40d01b2 100644
--- a/sysutils/cdrecord/pkg-plist
+++ b/sysutils/cdrecord/pkg-plist
@@ -1,4 +1,2 @@
 bin/cdrecord
 bin/cdda2wav
-@unexec rm -f /dev/scgx
-@exec ln -sf /dev/rworm0.ctl /dev/scgx
diff --git a/sysutils/cdrtools-devel/Makefile b/sysutils/cdrtools-devel/Makefile
index 04462ae1508a..5bab825a2070 100644
--- a/sysutils/cdrtools-devel/Makefile
+++ b/sysutils/cdrtools-devel/Makefile
@@ -6,18 +6,18 @@
 # $FreeBSD$
 #
 
-DISTNAME=	cdrecord-1.8a22
+DISTNAME=	cdrecord-1.8a28
 CATEGORIES=	sysutils audio
-MASTER_SITES=	ftp://ftp.fokus.gmd.de/pub/unix/cdrecord/alpha/
+MASTER_SITES=	ftp://ftp.fokus.gmd.de/pub/unix/cdrecord/alpha/ \
+		ftp://ftp.cs.tu-berlin.de/pub/misc/cdrecord/alpha/ \
+		ftp://ftp.gwdg.de/pub/linux/misc/cdrecord/alpha/
 
 MAINTAINER=	dirk@FreeBSD.org
 
 WRKSRC=         ${WRKDIR}/cdrecord-1.8
 MAN1=		cdrecord.1 cdda2wav.1
 USE_GMAKE=	yes
-
-do-build:
-	@cd ${WRKSRC} && ${GMAKE} COPTX=-DBSD_SCSI_SENSE_BUG
+MAKE_ENV=	COPTX=-DBSD_SCSI_SENSE_BUG
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/cdrecord/OBJ/i386-freebsd-cc/cdrecord \
diff --git a/sysutils/cdrtools-devel/distinfo b/sysutils/cdrtools-devel/distinfo
index 1dab606ce5f7..1feb8ca4290b 100644
--- a/sysutils/cdrtools-devel/distinfo
+++ b/sysutils/cdrtools-devel/distinfo
@@ -1 +1 @@
-MD5 (cdrecord-1.8a22.tar.gz) = 07b962c800788224e61fced0ad3c331d
+MD5 (cdrecord-1.8a28.tar.gz) = 2df21b533db6ba3a2283eb2a2c3241b3
diff --git a/sysutils/cdrtools-devel/pkg-plist b/sysutils/cdrtools-devel/pkg-plist
index 16c9afc76fd2..9fcbd40d01b2 100644
--- a/sysutils/cdrtools-devel/pkg-plist
+++ b/sysutils/cdrtools-devel/pkg-plist
@@ -1,4 +1,2 @@
 bin/cdrecord
 bin/cdda2wav
-@unexec rm -f /dev/scgx
-@exec ln -sf /dev/rworm0.ctl /dev/scgx
diff --git a/sysutils/cdrtools/Makefile b/sysutils/cdrtools/Makefile
index 04462ae1508a..5bab825a2070 100644
--- a/sysutils/cdrtools/Makefile
+++ b/sysutils/cdrtools/Makefile
@@ -6,18 +6,18 @@
 # $FreeBSD$
 #
 
-DISTNAME=	cdrecord-1.8a22
+DISTNAME=	cdrecord-1.8a28
 CATEGORIES=	sysutils audio
-MASTER_SITES=	ftp://ftp.fokus.gmd.de/pub/unix/cdrecord/alpha/
+MASTER_SITES=	ftp://ftp.fokus.gmd.de/pub/unix/cdrecord/alpha/ \
+		ftp://ftp.cs.tu-berlin.de/pub/misc/cdrecord/alpha/ \
+		ftp://ftp.gwdg.de/pub/linux/misc/cdrecord/alpha/
 
 MAINTAINER=	dirk@FreeBSD.org
 
 WRKSRC=         ${WRKDIR}/cdrecord-1.8
 MAN1=		cdrecord.1 cdda2wav.1
 USE_GMAKE=	yes
-
-do-build:
-	@cd ${WRKSRC} && ${GMAKE} COPTX=-DBSD_SCSI_SENSE_BUG
+MAKE_ENV=	COPTX=-DBSD_SCSI_SENSE_BUG
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/cdrecord/OBJ/i386-freebsd-cc/cdrecord \
diff --git a/sysutils/cdrtools/distinfo b/sysutils/cdrtools/distinfo
index 1dab606ce5f7..1feb8ca4290b 100644
--- a/sysutils/cdrtools/distinfo
+++ b/sysutils/cdrtools/distinfo
@@ -1 +1 @@
-MD5 (cdrecord-1.8a22.tar.gz) = 07b962c800788224e61fced0ad3c331d
+MD5 (cdrecord-1.8a28.tar.gz) = 2df21b533db6ba3a2283eb2a2c3241b3
diff --git a/sysutils/cdrtools/pkg-plist b/sysutils/cdrtools/pkg-plist
index 16c9afc76fd2..9fcbd40d01b2 100644
--- a/sysutils/cdrtools/pkg-plist
+++ b/sysutils/cdrtools/pkg-plist
@@ -1,4 +1,2 @@
 bin/cdrecord
 bin/cdda2wav
-@unexec rm -f /dev/scgx
-@exec ln -sf /dev/rworm0.ctl /dev/scgx