diff --git a/audio/vlorb/Makefile b/audio/vlorb/Makefile
index 3d8e561cf9a..e5ce1ab59d8 100644
--- a/audio/vlorb/Makefile
+++ b/audio/vlorb/Makefile
@@ -1,13 +1,11 @@
-# $OpenBSD: Makefile,v 1.2 2003/05/14 23:37:49 naddy Exp $
+# $OpenBSD: Makefile,v 1.3 2003/08/03 01:07:40 naddy Exp $
 
-COMMENT=		"cd2ogg with vorbisgain support"
-DISTNAME=		vlorb-1.1
+COMMENT=		"audio CD to audio file encoder"
+DISTNAME=		vlorb-1.2
 CATEGORIES=		audio
 
 HOMEPAGE=		http://jk.yazzy.org/projects/vlorb/
 
-MAINTAINER=		Han Boetes <han@linux-mandrake.org>
-
 # GPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
@@ -17,13 +15,13 @@ PERMIT_DISTFILES_FTP=	Yes
 MASTER_SITES=		${HOMEPAGE}/releases/
 
 RUN_DEPENDS=		:cdparanoia-*:audio/cdparanoia \
+			:flac-*:audio/flac \
 			:vorbis-tools-*:audio/vorbis-tools \
 			:vorbisgain-*:audio/vorbisgain \
 			:p5-CDDB-*:audio/p5-cddb
 
 NO_BUILD=		Yes
 NO_REGRESS=		Yes
-FAKE_FLAGS=		mandir=${DESTDIR}${TRUEPREFIX}/man
 
 pre-install:
 	@perl -i -pe 's:/etc/vlorbrc:${SYSCONFDIR}/vlorbrc:g' \
diff --git a/audio/vlorb/distinfo b/audio/vlorb/distinfo
index eb3a1f48726..13157ee28fc 100644
--- a/audio/vlorb/distinfo
+++ b/audio/vlorb/distinfo
@@ -1,3 +1,3 @@
-MD5 (vlorb-1.1.tar.gz) = 1bfb158c5af84ed73997b1b7bd4ba83f
-RMD160 (vlorb-1.1.tar.gz) = 0cc97e34f451f4a407c4edd18d31f90d78d4d383
-SHA1 (vlorb-1.1.tar.gz) = 3c8081a45835c32c81acd7f03d181c2ac5a6cc46
+MD5 (vlorb-1.2.tar.gz) = 4f4165fc6b1636f6f71805a01fb92859
+RMD160 (vlorb-1.2.tar.gz) = c842955556a78c9fcef2daeb5016d0b590668f0e
+SHA1 (vlorb-1.2.tar.gz) = 9e53d598c6aaca54a678fc0aa6bbbc83e3e84522
diff --git a/audio/vlorb/patches/patch-vlorb b/audio/vlorb/patches/patch-vlorb
index fffceb3db2a..dea47849b5c 100644
--- a/audio/vlorb/patches/patch-vlorb
+++ b/audio/vlorb/patches/patch-vlorb
@@ -1,53 +1,9 @@
-$OpenBSD: patch-vlorb,v 1.3 2003/05/23 20:07:47 naddy Exp $
---- vlorb.orig	Fri May 23 18:29:43 2003
-+++ vlorb	Fri May 23 18:30:05 2003
+$OpenBSD: patch-vlorb,v 1.4 2003/08/03 01:07:40 naddy Exp $
+--- vlorb.orig	Mon Jul 28 00:20:32 2003
++++ vlorb	Mon Jul 28 00:20:41 2003
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env perl
 +#!/usr/bin/perl
  #
- # vlorb, a CD to Ogg Vorbis ripper.
+ # vlorb, an audio CD to audio file encoder.
  # Copyright (c) 2002, Jochem Kossen <j.kossen@home.nl>
-@@ -36,7 +36,7 @@ use warnings;
- my %config;
- 
- # Path to device name of CD-ROM to use.
--$config{device} = '/dev/cdrom';
-+$config{device} = '/dev/cd0c';
- 
- # 1 = Use bitrate mode, 0 = use quality mode for ogg encoding.
- $config{use_bitrate} = 0;
-@@ -312,7 +312,7 @@ sub mk_album_directory() {
-     my ($artist, $disctitle, $mask) = @_;
-     my $albumdir;
- 
--    if ($global{singleartist}) {
-+    if (($global{singleartist}) && ($disctitle ne $config{unknown})) {
- 	my @dname = split(//, $mask);
- 	for (@dname) {
- 	    ($_ ne 'A' && $_ ne 'D') && do { &error('error in dirmask: ' . $mask) };
-@@ -332,7 +332,7 @@ sub mk_album_directory() {
- 	    $dirname = $dirname . $config{filemask_seperator} . $dname[$i] if ($dname[$i]);
- 	    $i++;
- 	}
--        $albumdir = $dirname;
-+	$albumdir = $dirname;
-     } else {
- 	$albumdir = $disctitle;
-     }
-@@ -733,11 +733,11 @@ sub vlorb() {
- 	&msg("\n") if $config{show_progress};
- 
- 	# escape double quotes in strings
--	$tracktitle =~ s/"/\\"/g;
--	$disctitle =~ s/"/\\"/g;
--	$artist =~ s/"/\\"/g;
--	$genre =~ s/"/\\"/g;
--	$filename =~ s/"/\\"/g;
-+	$tracktitle =~ s/"/\\"/g if ($tracktitle);
-+	$disctitle =~ s/"/\\"/g if ($disctitle);
-+	$artist =~ s/"/\\"/g if ($artist);
-+	$genre =~ s/"/\\"/g if ($genre);
-+	$filename =~ s/"/\\"/g if ($filename);
- 
- 	my $bq = "-q $config{quality}";
- 	$bq = "-b $config{bitrate}" if ($config{use_bitrate});
diff --git a/audio/vlorb/patches/patch-vlorb_1 b/audio/vlorb/patches/patch-vlorb_1
deleted file mode 100644
index 117a8921aed..00000000000
--- a/audio/vlorb/patches/patch-vlorb_1
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-vlorb_1,v 1.1 2003/05/14 23:37:49 naddy Exp $
---- vlorb.1.orig	Wed May 14 15:54:33 2003
-+++ vlorb.1	Wed May 14 15:54:51 2003
-@@ -138,7 +138,7 @@ NOTE: You can only use one of -b and -q
- See also \fBoggenc\fR(1) for the -b option
- .TP
- \fB-d \fIdevice\fB\fR
--Use device instead of /dev/cdrom
-+Use device instead of /dev/cd0c
- .TP
- \fB-i \fItracklist\fB\fR
- Only rip these tracks.
diff --git a/audio/vlorb/pkg/DESCR b/audio/vlorb/pkg/DESCR
index 5fbcadbd8ee..256d2fc42a8 100644
--- a/audio/vlorb/pkg/DESCR
+++ b/audio/vlorb/pkg/DESCR
@@ -1,7 +1,7 @@
-vlorb is a console frontend for cdparanoia and CDDB. It rips and encodes
-tracks from an audio CD to Ogg Vorbis files. The aim of vlorb is to
-create high-quality Ogg Vorbis audio files in a simple way, while
-providing a comfortable feature set.
+vlorb is a console frontend for cdparanoia and CDDB.  It rips and
+encodes tracks from an audio CD to Ogg Vorbis, FLAC, or WAV files.
+The aim of vlorb is to create high-quality audio files in a simple
+way, while providing a comfortable feature set.
 
 vlorb uses CDDB to get CD information for tagging and file naming.