diff --git a/xCAT-buildkit/bin/buildkit b/xCAT-buildkit/bin/buildkit
index 340ed7d56..fdfeaff47 100755
--- a/xCAT-buildkit/bin/buildkit
+++ b/xCAT-buildkit/bin/buildkit
@@ -2644,7 +2644,11 @@ sub create_builddir
         
         foreach my $plugin (<$::workdir/plugins/*.pm>){
             my $plugin_base = basename($plugin);
-            my $to_plugin = $plugin_dir."/".$kitname."_".$plugin_base;
+            my $mod_kitname = $kitname;
+            $mod_kitname =~ s/\-/\_/g;
+            $mod_kitname =~ s/\./\_/g;
+            my $to_plugin = $plugin_dir."/".$mod_kitname."_".$plugin_base;
+
             if ( system("cp -fp $plugin $to_plugin") ) {
                 # non-zero return from system call
                 print "Error copying plugin file $plugin to build directory $plugin_dir \n";
diff --git a/xCAT-buildkit/share/xcat/kits/kit_template/plugins/sample/imageprofile.pm b/xCAT-buildkit/share/xcat/kits/kit_template/plugins/sample/imageprofile.pm
index 87307b132..212aa60e6 100644
--- a/xCAT-buildkit/share/xcat/kits/kit_template/plugins/sample/imageprofile.pm
+++ b/xCAT-buildkit/share/xcat/kits/kit_template/plugins/sample/imageprofile.pm
@@ -742,3 +742,4 @@ sub parse_list_arg {
 
 }
 
+1;
\ No newline at end of file
diff --git a/xCAT-buildkit/share/xcat/kits/kit_template/plugins/sample/nodemgmt.pm b/xCAT-buildkit/share/xcat/kits/kit_template/plugins/sample/nodemgmt.pm
index e8392efe4..99af010f1 100644
--- a/xCAT-buildkit/share/xcat/kits/kit_template/plugins/sample/nodemgmt.pm
+++ b/xCAT-buildkit/share/xcat/kits/kit_template/plugins/sample/nodemgmt.pm
@@ -392,3 +392,4 @@ sub kitnoderefresh {
     #
 }
 
+1;
\ No newline at end of file