diff --git a/xCAT-buildkit/bin/buildkit b/xCAT-buildkit/bin/buildkit
index 2c4d2e374..02ca942cb 100755
--- a/xCAT-buildkit/bin/buildkit
+++ b/xCAT-buildkit/bin/buildkit
@@ -1915,6 +1915,8 @@ sub build_kitcomp
     #   specifically reference it's version-release
     if ( &update_kitcomp_kitpkgdeps($comp,$repodir) ) { return 1; }
 
+    $::VALID_PRER_COMPONENT = 0;
+
     if ( !$::PREREQUISITE ) {
         if ( $comp->{ospkgdeps} || $comp->{preinstall} || $comp->{preupgrade} || $comp->{preuninstall} ) {
             if ( &gen_kitcomp_spec($comp,\%repo, 'PREREQUISITE') ) { return 1; }
@@ -1954,6 +1956,8 @@ sub build_kitcomp
                 }
             }
 
+            $::VALID_PRER_COMPONENT = 1;
+
         }
 
         if ( &gen_kitcomp_spec($comp,\%repo, 'METARPM') ) { return 1; }
@@ -2271,7 +2275,12 @@ sub gen_kitcomp_spec
             s/<<<INSERT_url_HERE>>>/$::bldkit_config->{kit}{entries}[0]->{url}/;
             s/<<<INSERT_kitcomponent_ospkgdeps_HERE>>>//;
             s/<<<INSERT_kitcomponent_kitpkgdeps_HERE>>>/$comp->{kitpkgdeps}/;
-            s/<<<INSERT_kitcomponent_kitcompdeps_HERE>>>/$comp->{kitcompdeps}/;
+            #Update kitcompdeps for prep_<kitcomponent>
+            if ( $::VALID_PRER_COMPONENT ) {
+                s/<<<INSERT_kitcomponent_kitcompdeps_HERE>>>/$comp->{kitcompdeps},prep_$comp->{basename}/;
+            } else {
+                s/<<<INSERT_kitcomponent_kitcompdeps_HERE>>>/$comp->{kitcompdeps}/;
+            }
             s/<<<INSERT_kitcomponent_desc_HERE>>>/$comp->{description}/;
             s/<<<INSERT_kitcomponent_non_native_pkgs_HERE>>>/$nonnativepkgs/;
             s/<<<INSERT_kitcomponent_sourcetar_HERE>>>/$sourcetar/;