diff -Nru nagios-plugins-1.4.8.orig/configure.in nagios-plugins-1.4.8/configure.in
--- nagios-plugins-1.4.8.orig/configure.in	2007-04-11 15:08:05.000000000 +0300
+++ nagios-plugins-1.4.8/configure.in	2007-05-11 19:44:10.000000000 +0300
@@ -246,7 +246,7 @@
   AC_MSG_WARN([Skipping mysql plugin])
   AC_MSG_WARN([install mysql client libs to compile this plugin (see REQUIREMENTS).])
 else
-  EXTRAS="$EXTRA check_mysql check_mysql_query"
+  EXTRAS="$EXTRAS check_mysql check_mysql_query"
   MYSQLINCLUDE="$np_mysql_include"
   MYSQLLIBS="$np_mysql_libs"
   MYSQLCFLAGS="$np_mysql_cflags"
diff -Nru nagios-plugins-1.4.8.orig/contrib/check_dns_random.pl nagios-plugins-1.4.8/contrib/check_dns_random.pl
--- nagios-plugins-1.4.8.orig/contrib/check_dns_random.pl	2003-01-29 07:27:20.000000000 +0200
+++ nagios-plugins-1.4.8/contrib/check_dns_random.pl	2007-05-11 18:58:36.000000000 +0300
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -w
 # ------------------------------------------------------------------------------
 # File Name:            check_dns_random.pl
 # Author:               Richard Mayhew - South Africa
@@ -33,9 +33,9 @@
 
 my $host = shift || &usage;
 
-my $domainfile = "/usr/local/nagios/etc/domains.list";
+my $domainfile = "/etc/nagios/domains.list";
 my $wc = `/usr/bin/wc -l $domainfile`;
-my $check = "/usr/local/nagios/libexec/check_dns";
+my $check = "/usr/nagios/libexec/check_dns";
 my $x = 0;
 my $srv_file = "";
 my $z = "";
@@ -49,8 +49,7 @@
                 my @data = split(/\n/,$srv_file);
 
 chomp $wc;
-$wc =~ s/ //g;
-$wc =~ s/domains//g;
+$wc =~ s/([[:digit:]]+) .*/$1/g;
 
 $x = rand $wc;
 ($z,$y) = split(/\./,$x);
diff -Nru nagios-plugins-1.4.8.orig/contrib/check_linux_raid.pl nagios-plugins-1.4.8/contrib/check_linux_raid.pl
--- nagios-plugins-1.4.8.orig/contrib/check_linux_raid.pl	2006-06-07 17:28:33.000000000 +0300
+++ nagios-plugins-1.4.8/contrib/check_linux_raid.pl	2007-05-11 18:45:52.000000000 +0300
@@ -23,7 +23,7 @@
 #	  WARNING md0 status=[UUU_U], recovery=46.4%, finish=123.0min
 
 use strict;
-use lib utils.pm;
+use lib '/usr/nagios/libexec';
 use utils qw(%ERRORS);
 
 # die with an error if we're not on Linux