diff --git a/xCAT-buildkit/bin/buildkit b/xCAT-buildkit/bin/buildkit
index 1a159f257..d8621acba 100755
--- a/xCAT-buildkit/bin/buildkit
+++ b/xCAT-buildkit/bin/buildkit
@@ -111,7 +111,12 @@ $::deploy_dir = $::build_dir; #kitname appended by validate_bldkitconf routine
                value_desc=>'Must be: empty string or relative path string',
                mandatory=>0,
                base_dir=>'other_files',
-               cp_to_kitconfig=>2} }, # 2 = rename with KIT_KITNAME_ on cp
+               cp_to_kitconfig=>2}, # 2 = rename with KIT_KITNAME_ on cp
+              kitlicense=> {
+               description=>'The Kit license string to be built into all kitcomponent packages.',
+               value_desc=>'any string',
+               mandatory=>1,
+               cp_to_kitconfig=>0} },
     kitrepo => {kitrepoid => {
                description=>'The Kit Package Repository ID.  (e.g., rhels-6.2-x86_64)',
                value_desc=>'Must be: Generic Name String, unique in kit',
@@ -1835,6 +1840,7 @@ sub gen_kitcomp_spec
         s/<<<INSERT_kitcomponent_basename_HERE>>>/$comp->{basename}/;
         s/<<<INSERT_kitcomponent_version_HERE>>>/$comp->{version}/;
         s/<<<INSERT_kitcomponent_release_HERE>>>/$comp->{release}/;
+        s/<<<INSERT_kit_license_HERE>>>/$::bldkit_config->{kit}{entries}[0]->{kitlicense}/;
         s/<<<INSERT_kitcomponent_ospkgdeps_HERE>>>/$comp->{ospkgdeps}/;
         s/<<<INSERT_kitcomponent_kitpkgdeps_HERE>>>/$comp->{kitpkgdeps}/;
         s/<<<INSERT_kitcomponent_kitcompdeps_HERE>>>/$comp->{kitcompdeps}/;
diff --git a/xCAT-buildkit/share/xcat/kits/kit_template/buildkit.conf b/xCAT-buildkit/share/xcat/kits/kit_template/buildkit.conf
index 5ab4daad9..d692bd2f7 100644
--- a/xCAT-buildkit/share/xcat/kits/kit_template/buildkit.conf
+++ b/xCAT-buildkit/share/xcat/kits/kit_template/buildkit.conf
@@ -20,12 +20,15 @@
 #    kitdeployparams (optional)  Filename containing a list of kit deployment
 #                       parameters, relative to
 #                       <Kit Build Directory>/other_files
+#    kitlicense      (mandatory) Kit license string to be built into all
+#                       kitcomponent packages
 kit:
    basename=<<<INSERT_kitbasename_HERE>>>
    description=description for <<<INSERT_kitbasename_HERE>>>
    version=1.0
    ostype=Linux
    kitdeployparams=sample/kitdeployparams.lst
+   kitlicense=EPL
 
 
 # kitrepo: This section defines a Kit Package Repository.
diff --git a/xCAT-buildkit/share/xcat/kits/kitcomponent.spec.template b/xCAT-buildkit/share/xcat/kits/kitcomponent.spec.template
index d7cd10598..78fc04c21 100644
--- a/xCAT-buildkit/share/xcat/kits/kitcomponent.spec.template
+++ b/xCAT-buildkit/share/xcat/kits/kitcomponent.spec.template
@@ -3,7 +3,7 @@ Name: <<<INSERT_kitcomponent_basename_HERE>>>
 Version: <<<INSERT_kitcomponent_version_HERE>>>
 Release: <<<INSERT_kitcomponent_release_HERE>>>
 Group: Applications/System
-License: EPL
+License: <<<INSERT_kit_license_HERE>>>
 BuildArch: noarch
 Requires:   <<<INSERT_kitcomponent_ospkgdeps_HERE>>>,<<<INSERT_kitcomponent_kitpkgdeps_HERE>>>,<<<INSERT_kitcomponent_kitcompdeps_HERE>>>