diff --git a/xCAT-server/lib/xcat/plugins/yaboot.pm b/xCAT-server/lib/xcat/plugins/yaboot.pm
index 31cd9ce36..24201687a 100644
--- a/xCAT-server/lib/xcat/plugins/yaboot.pm
+++ b/xCAT-server/lib/xcat/plugins/yaboot.pm
@@ -162,25 +162,13 @@ sub setstate {
    my $pname = sprintf("%02x%02x%02x%02x",@ipa);
     #special case for sles 11
    my @mac_substr = split /\:/, $machash{$node}->[0]->{mac};
-   my $sles11_special_link = sprintf("yaboot.conf-%s-%s-%s-%s-%s-%s", @mac_substr);
+   my $sles_yaboot_link = sprintf("yaboot.conf-%s-%s-%s-%s-%s-%s", @mac_substr);
    unlink($tftpdir."/etc/".$pname);
-   if ( $kern->{'kernel'} =~ /sles11\/ppc64\//) #special case for sles 11
-   {
-       unlink($tftpdir . "/" . $sles11_special_link);
-   }
-   #if ($hassymlink) { 
-   #    symlink($node,$tftpdir."/etc/".$pname);
-   #    if ( $kern->{'kernel'} =~ /sles11\/ppc64\//) #special case for sles 11
-   #    {
-   #        symlink($tftpdir."/etc/".$node, $tftpdir . '/' . $sles11_special_link);
-   #    }
-   #} else {
-       link($tftpdir."/etc/".$node,$tftpdir."/etc/".$pname);
-       if ( $kern->{'kernel'} =~ /sles11\/ppc64\//) #special case for sles 11
-       {
-           link($tftpdir."/etc/".$node, $tftpdir . '/' . $sles11_special_link);
-       }
-   #}
+   link($tftpdir."/etc/".$node,$tftpdir."/etc/".$pname);
+
+   # Add the yaboot.conf-%s-%s-%s-%s-%s-%s for both the rh and sles
+   unlink($tftpdir . "/" . $sles_yaboot_link);
+   link($tftpdir."/etc/".$node, $tftpdir . '/' . $sles_yaboot_link);
   }
 }