diff --git a/audio/nbc-vbi/distinfo b/audio/nbc-vbi/distinfo
index 750d335112e4..62e89b30fa52 100644
--- a/audio/nbc-vbi/distinfo
+++ b/audio/nbc-vbi/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2001/04/22 08:30:47 tron Exp $
+$NetBSD: distinfo,v 1.3 2001/04/22 09:59:33 tron Exp $
 
 SHA1 (nbc-vbi-0.32-Source.tgz) = 97494878d782c150185e07dc294f4315c0914393
 Size (nbc-vbi-0.32-Source.tgz) = 25206 bytes
-SHA1 (patch-aa) = 4d6b11082071217101d2e903d18cc2b16d2de087
-SHA1 (patch-ab) = 19e679e038723731bc5b723e65ee83658bcc992a
-SHA1 (patch-ac) = 0707ab341aa1e7e208c8d19144d7790e6dcb5fab
+SHA1 (patch-aa) = d213cf28cb215983c8399bf542eaea575bb73f13
+SHA1 (patch-ab) = cb7dd5e9c1006e8f0ce9971d8c2419d832289c11
+SHA1 (patch-ac) = 5b18c6d8d26df6daabc7409db61776bb96d2b227
diff --git a/audio/nbc-vbi/patches/patch-aa b/audio/nbc-vbi/patches/patch-aa
index 092c0f9661b0..8f3d1ccf26be 100644
--- a/audio/nbc-vbi/patches/patch-aa
+++ b/audio/nbc-vbi/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/04/22 08:19:54 tron Exp $
+$NetBSD: patch-aa,v 1.2 2001/04/22 09:59:33 tron Exp $
 
 --- Makefile.orig	Sun Oct 29 14:03:25 2000
-+++ Makefile	Sun Apr 22 10:17:35 2001
++++ Makefile	Sun Apr 22 11:55:45 2001
 @@ -2,7 +2,7 @@
  MP3DIR=mp3
  COVERDIR=covers
diff --git a/audio/nbc-vbi/patches/patch-ab b/audio/nbc-vbi/patches/patch-ab
index 9b09fa3fe4f2..d1d1442cdf42 100644
--- a/audio/nbc-vbi/patches/patch-ab
+++ b/audio/nbc-vbi/patches/patch-ab
@@ -1,18 +1,17 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/04/22 08:19:54 tron Exp $
+$NetBSD: patch-ab,v 1.2 2001/04/22 09:59:33 tron Exp $
 
 --- src/global.h.orig	Sun Oct 29 15:21:19 2000
-+++ src/global.h	Sun Apr 22 10:03:51 2001
++++ src/global.h	Sun Apr 22 11:57:49 2001
 @@ -16,9 +16,11 @@
  #include <unistd.h>
  
  
 -#include <linux/ioctl.h>
 -#include <linux/types.h>
--#include <linux/videodev.h>
 +#include <sys/ioctl.h>
 +#include <sys/types.h>
-+#ifdef __LINUX__
-+#include <sys/videodev.h>
++#ifdef __linux__
+ #include <linux/videodev.h>
 +#endif
  
  #include <sys/ioctl.h>
diff --git a/audio/nbc-vbi/patches/patch-ac b/audio/nbc-vbi/patches/patch-ac
index b36c352c8a74..460d0e23c8e1 100644
--- a/audio/nbc-vbi/patches/patch-ac
+++ b/audio/nbc-vbi/patches/patch-ac
@@ -1,13 +1,16 @@
-$NetBSD: patch-ac,v 1.1 2001/04/22 08:30:47 tron Exp $
+$NetBSD: patch-ac,v 1.2 2001/04/22 09:59:33 tron Exp $
 
 --- src/config.h.orig	Sun Oct 29 13:52:41 2000
-+++ src/config.h	Sun Apr 22 10:29:56 2001
-@@ -18,7 +18,7 @@
++++ src/config.h	Sun Apr 22 11:57:04 2001
+@@ -18,7 +18,11 @@
  #define D_FILTERFILE  "filter"	// Name of the filterfile
  #define D_GARBAGEPATH "garbage/"	// Default place to save html/gif etc
  #define D_CONFIGFILE  "nbc-vbi.conf"	// Default config file
--#define D_DEVICE      "/dev/vbi0"	// Default device to read from
++#ifdef __linux__
+ #define D_DEVICE      "/dev/vbi0"	// Default device to read from
++#else
 +#define D_DEVICE      "/dev/vbi"	// Default device to read from
++#endif
  #define D_FILTERING   1		// Do Filtering as default
  #define D_MINMP3SIZE  0		// Minimal MP3 Size in KB
  #define D_MAXERRORS   -1	// maximal errors an MP3 file may have