diff --git a/ipmitool/bldipmi.pl b/ipmitool/bldipmi.pl
index a2cd585..52879be 100755
--- a/ipmitool/bldipmi.pl
+++ b/ipmitool/bldipmi.pl
@@ -60,7 +60,7 @@ if ( (! -f "$pwd/ipmitool-$version.tar.gz")
 my $blddir;
 if ($os eq "rh5") {
   $blddir = "/usr/src/redhat";
-} elsif (($os eq "rh6") || ($os eq "rh7")) {
+} elsif ($os =~ /rh\d/) {
   $blddir = "/root/rpmbuild";
 } elsif ($os =~ /sles1\d/) {
   $blddir = "/usr/src/packages";
@@ -119,12 +119,6 @@ if (! -f $objrpm) {
   exit 0;
 }
 
-
-
-
-
-
-
 sub runcmd () {
   my $cmd = shift;
   print "++++Trying to run command: [$cmd]\n";