diff --git a/webtools/bugzilla/Bug.pm b/webtools/bugzilla/Bug.pm
index 8b4243c25bf4..ea159ccdc991 100755
--- a/webtools/bugzilla/Bug.pm
+++ b/webtools/bugzilla/Bug.pm
@@ -27,6 +27,7 @@ use strict;
 
 use DBI;
 use RelationSet;
+use vars qw($unconfirmedstate $legal_keywords);
 require "globals.pl";
 require "CGI.pl";
 package Bug;
@@ -86,7 +87,7 @@ sub initBug  {
   }
   else {
      if ($user_id =~ /^\@/) {
-	$user_id = &::DBname_to_id($user_id); 
+        $user_id = &::DBname_to_id($user_id); 
      }
   }
      
@@ -127,11 +128,11 @@ sub initBug  {
                        "bug_file_loc", "short_desc", "target_milestone",
                        "qa_contact", "status_whiteboard", "creation_ts",
                        "groupset", "delta_ts", "votes") {
-	$fields{$field} = shift @row;
-	if ($fields{$field}) {
-	    $self->{$field} = $fields{$field};
-	}
-	$count++;
+        $fields{$field} = shift @row;
+        if ($fields{$field}) {
+            $self->{$field} = $fields{$field};
+        }
+        $count++;
     }
   } else {
     &::SendSQL("select groupset from bugs where bug_id = $bug_id");
diff --git a/webtools/bugzilla/Bugzilla/Bug.pm b/webtools/bugzilla/Bugzilla/Bug.pm
index 8b4243c25bf4..ea159ccdc991 100644
--- a/webtools/bugzilla/Bugzilla/Bug.pm
+++ b/webtools/bugzilla/Bugzilla/Bug.pm
@@ -27,6 +27,7 @@ use strict;
 
 use DBI;
 use RelationSet;
+use vars qw($unconfirmedstate $legal_keywords);
 require "globals.pl";
 require "CGI.pl";
 package Bug;
@@ -86,7 +87,7 @@ sub initBug  {
   }
   else {
      if ($user_id =~ /^\@/) {
-	$user_id = &::DBname_to_id($user_id); 
+        $user_id = &::DBname_to_id($user_id); 
      }
   }
      
@@ -127,11 +128,11 @@ sub initBug  {
                        "bug_file_loc", "short_desc", "target_milestone",
                        "qa_contact", "status_whiteboard", "creation_ts",
                        "groupset", "delta_ts", "votes") {
-	$fields{$field} = shift @row;
-	if ($fields{$field}) {
-	    $self->{$field} = $fields{$field};
-	}
-	$count++;
+        $fields{$field} = shift @row;
+        if ($fields{$field}) {
+            $self->{$field} = $fields{$field};
+        }
+        $count++;
     }
   } else {
     &::SendSQL("select groupset from bugs where bug_id = $bug_id");
diff --git a/webtools/bugzilla/Bugzilla/RelationSet.pm b/webtools/bugzilla/Bugzilla/RelationSet.pm
index 4b778a6fdbe4..bfd572400932 100644
--- a/webtools/bugzilla/Bugzilla/RelationSet.pm
+++ b/webtools/bugzilla/Bugzilla/RelationSet.pm
@@ -103,8 +103,8 @@ sub generateSqlDeltas {
   if ( $#insertList > -1 ) {
     $sqlInsert = "INSERT INTO $table ($invariantName, $columnName) VALUES " .
       join (",", 
-	    map ( "($invariantValue, $_)" , @insertList ) 
-	   );
+            map ( "($invariantValue, $_)" , @insertList ) 
+           );
   }
      
   # construct the delete list by seeing which relations exist in the
diff --git a/webtools/bugzilla/RelationSet.pm b/webtools/bugzilla/RelationSet.pm
index 4b778a6fdbe4..bfd572400932 100644
--- a/webtools/bugzilla/RelationSet.pm
+++ b/webtools/bugzilla/RelationSet.pm
@@ -103,8 +103,8 @@ sub generateSqlDeltas {
   if ( $#insertList > -1 ) {
     $sqlInsert = "INSERT INTO $table ($invariantName, $columnName) VALUES " .
       join (",", 
-	    map ( "($invariantValue, $_)" , @insertList ) 
-	   );
+            map ( "($invariantValue, $_)" , @insertList ) 
+           );
   }
      
   # construct the delete list by seeing which relations exist in the