diff --git a/cave/build/p2-build.xml b/cave/build/p2-build.xml
index eafc720c43..c9d3bd9fb5 100644
--- a/cave/build/p2-build.xml
+++ b/cave/build/p2-build.xml
@@ -147,6 +147,8 @@
 		<antcall target="p2.build.repo">
 			<param name="feature"
 				value="com.raytheon.viz.feature.awips" />
+			<param name="omit"
+				value="false" />
 		</antcall>
 		<antcall target="p2.build.repo">
 			<param name="feature"
@@ -334,6 +336,18 @@
 			</classpath>
 		</java>
 		
+		<!-- Record that the feature has been built (for now) -->
+		<if>
+			<not>
+				<isset property="omit" />
+			</not>
+			<then>
+				<echo message="${feature}${line.separator}"
+					file="${basedir}/cave/p2/dist/features.txt"
+					append="true" />
+			</then>
+		</if>
+
 		<!-- Package The Repository -->
 		<zip
 			destfile="${basedir}/cave/p2/dist/${feature}-repo-${build.os}.${build.arch}.zip"
diff --git a/msi/build/A2Staging/Scripts/assembleCAVE.ps1 b/msi/build/A2Staging/Scripts/assembleCAVE.ps1
index 84484cddde..a8a6135b4b 100644
--- a/msi/build/A2Staging/Scripts/assembleCAVE.ps1
+++ b/msi/build/A2Staging/Scripts/assembleCAVE.ps1
@@ -8,75 +8,20 @@ function installCAVERepository([string]$feature_group, [string]$repo_zip)
 }
 
 pushd .
+
 cd ${A2_PREPARE_CAVE_DIR}\cave
 
 echo "`n"
-installCAVERepository -feature_group "com.raytheon.uf.viz.cots.feature.feature.group" `
-    -repo_zip "com.raytheon.uf.viz.cots.feature-repo-win32.x86.zip"
-installCAVERepository -feature_group "com.raytheon.uf.viz.common.core.feature.feature.group" `
-    -repo_zip "com.raytheon.uf.viz.common.core.feature-repo-win32.x86.zip"
-installCAVERepository -feature_group "com.raytheon.uf.viz.core.feature.feature.group" `
-    -repo_zip "com.raytheon.uf.viz.core.feature-repo-win32.x86.zip"
-installCAVERepository -feature_group "com.raytheon.uf.viz.d2d.core.feature.feature.group" `
-    -repo_zip "com.raytheon.uf.viz.d2d.core.feature-repo-win32.x86.zip"
-installCAVERepository -feature_group "com.raytheon.viz.radar.feature.feature.group" `
-    -repo_zip "com.raytheon.viz.radar.feature-repo-win32.x86.zip"
-installCAVERepository -feature_group "com.raytheon.viz.grib.feature.feature.group" `
-    -repo_zip "com.raytheon.viz.grib.feature-repo-win32.x86.zip"
-installCAVERepository -feature_group "com.raytheon.uf.viz.sounding.feature.feature.group" `
-    -repo_zip "com.raytheon.uf.viz.sounding.feature-repo-win32.x86.zip"
-installCAVERepository -feature_group "com.raytheon.uf.viz.dataplugins.feature.feature.group" `
-    -repo_zip "com.raytheon.uf.viz.dataplugins.feature-repo-win32.x86.zip"
-installCAVERepository -feature_group "com.raytheon.uf.viz.dataplugin.obs.feature.feature.group" `
-    -repo_zip "com.raytheon.uf.viz.dataplugin.obs.feature-repo-win32.x86.zip"
-installCAVERepository -feature_group "com.raytheon.uf.viz.displays.feature.feature.group" `
-    -repo_zip "com.raytheon.uf.viz.displays.feature-repo-win32.x86.zip"
-installCAVERepository -feature_group "com.raytheon.viz.text.feature.feature.group" `
-    -repo_zip "com.raytheon.viz.text.feature-repo-win32.x86.zip"
-installCAVERepository -feature_group "com.raytheon.viz.satellite.feature.feature.group" `
-    -repo_zip "com.raytheon.viz.satellite.feature-repo-win32.x86.zip"
-installCAVERepository -feature_group "com.raytheon.uf.viz.ncep.core.feature.feature.group" `
-    -repo_zip "com.raytheon.uf.viz.ncep.core.feature-repo-win32.x86.zip"
-installCAVERepository -feature_group "com.raytheon.uf.viz.d2d.xy.feature.feature.group" `
-    -repo_zip "com.raytheon.uf.viz.d2d.xy.feature-repo-win32.x86.zip"
-installCAVERepository -feature_group "com.raytheon.uf.viz.core.maps.feature.feature.group" `
-    -repo_zip "com.raytheon.uf.viz.core.maps.feature-repo-win32.x86.zip"
-installCAVERepository -feature_group "com.raytheon.viz.gfe.feature.feature.group" `
-    -repo_zip "com.raytheon.viz.gfe.feature-repo-win32.x86.zip"
-installCAVERepository -feature_group "com.raytheon.viz.avnfps.feature.feature.group" `
-    -repo_zip "com.raytheon.viz.avnfps.feature-repo-win32.x86.zip"
-installCAVERepository -feature_group "com.raytheon.viz.hydro.feature.feature.group" `
-    -repo_zip "com.raytheon.viz.hydro.feature-repo-win32.x86.zip"
-installCAVERepository -feature_group "com.raytheon.uf.viz.d2d.skewt.feature.feature.group" `
-    -repo_zip "com.raytheon.uf.viz.d2d.skewt.feature-repo-win32.x86.zip"
-installCAVERepository -feature_group "com.raytheon.uf.viz.ncep.dataplugins.feature.feature.group" `
-    -repo_zip "com.raytheon.uf.viz.ncep.dataplugins.feature-repo-win32.x86.zip"
-installCAVERepository -feature_group "com.raytheon.uf.viz.ncep.displays.feature.feature.group" `
-    -repo_zip "com.raytheon.uf.viz.ncep.displays.feature-repo-win32.x86.zip"
-installCAVERepository -feature_group "com.raytheon.uf.viz.ncep.nsharp.feature.feature.group" `
-    -repo_zip "com.raytheon.uf.viz.ncep.nsharp.feature-repo-win32.x86.zip"
-installCAVERepository -feature_group "com.raytheon.uf.viz.d2d.nsharp.feature.feature.group" `
-    -repo_zip "com.raytheon.uf.viz.d2d.nsharp.feature-repo-win32.x86.zip"
-installCAVERepository -feature_group "com.raytheon.viz.volumebrowser.feature.feature.group" `
-    -repo_zip "com.raytheon.viz.volumebrowser.feature-repo-win32.x86.zip"
-installCAVERepository -feature_group "com.raytheon.uf.viz.d2d.gfe.feature.feature.group" `
-    -repo_zip "com.raytheon.uf.viz.d2d.gfe.feature-repo-win32.x86.zip"
-installCAVERepository -feature_group "com.raytheon.viz.warngen.feature.feature.group" `
-    -repo_zip "com.raytheon.viz.warngen.feature-repo-win32.x86.zip"
-installCAVERepository -feature_group "com.raytheon.uf.viz.ncep.perspective.feature.feature.group" `
-    -repo_zip "com.raytheon.uf.viz.ncep.perspective.feature-repo-win32.x86.zip"
-installCAVERepository -feature_group "com.raytheon.uf.viz.nwsauth.feature.feature.group" `
-    -repo_zip "com.raytheon.uf.viz.nwsauth.feature-repo-win32.x86.zip"
-installCAVERepository -feature_group "com.raytheon.uf.viz.thinclient.feature.feature.group" `
-    -repo_zip "com.raytheon.uf.viz.thinclient.feature-repo-win32.x86.zip"
-installCAVERepository -feature_group "com.raytheon.uf.viz.dat.feature.feature.group" `
-    -repo_zip "com.raytheon.uf.viz.dat.feature-repo-win32.x86.zip"
-installCAVERepository -feature_group "com.raytheon.uf.viz.localization.perspective.feature.feature.group" `
-    -repo_zip "com.raytheon.uf.viz.localization.perspective.feature-repo-win32.x86.zip"
-installCAVERepository -feature_group "com.raytheon.uf.viz.alertviz.localization.feature.feature.group" `
-    -repo_zip "com.raytheon.uf.viz.alertviz.localization.feature-repo-win32.x86.zip"
-installCAVERepository -feature_group "com.raytheon.uf.viz.npp.feature.feature.group" `
-    -repo_zip "com.raytheon.uf.viz.npp.feature-repo-win32.x86.zip"
-
+$feature_list = Get-Content "${A2_PREPARE_CAVE_DIR}\features.txt"
+Write-Host Feature Count = $feature_list.count
+foreach ($feature in $feature_list)
+{
+    Write-Host Installing Feature: $feature
+    $feature_group = $feature + ".feature.group"
+    $repo_zip = $feature + "-repo-win32.x86.zip"
+    
+    installCAVERepository -feature_group "$feature_group" `
+        -repo_zip "$repo_zip" 
+}
 popd
 EXIT 0
\ No newline at end of file
diff --git a/rpms/awips2.cave/deploy.builder/build.sh b/rpms/awips2.cave/deploy.builder/build.sh
index 21310ebdf9..2d2fad1967 100644
--- a/rpms/awips2.cave/deploy.builder/build.sh
+++ b/rpms/awips2.cave/deploy.builder/build.sh
@@ -172,29 +172,20 @@ function buildFeatureRPMs()
    local CONST_SETUP_DIR="Installer.cave-feature/feature.setup"
    local CONST_SETUP_DIR_FULL="${WORKSPACE}/rpms/awips2.cave/${CONST_SETUP_DIR}"
    local CONST_FEATURE_DIR="${WORKSPACE}/build/cave/p2/features"
+   local CONST_FEATURES_TXT="${WORKSPACE}/build/cave/p2/dist/features.txt"
+   
+   if [ ! -f ${CONST_FEATURES_TXT} ]; then
+      echo "ERROR: Unable to find the list of features - ${CONST_FEATURES_TXT}."
+      exit 1
+   fi
 
    local PROCESS_FEATURE_JAR="${WORKSPACE}/build/tools/ProcessFeature.jar"
 
-   if [ -d ${CONST_FEATURE_DIR}/com.raytheon.viz.feature.awips ]; then
-      rm -rf ${CONST_FEATURE_DIR}/com.raytheon.viz.feature.awips
-   fi
-   if [ -d ${CONST_FEATURE_DIR}/com.raytheon.uf.viz.eclipse.feature ]; then
-      rm -rf ${CONST_FEATURE_DIR}/com.raytheon.uf.viz.eclipse.feature
-   fi
-   if [ -d ${CONST_FEATURE_DIR}/com.raytheon.uf.viz.feature.alertviz ]; then
-      rm -rf ${CONST_FEATURE_DIR}/com.raytheon.uf.viz.feature.alertviz
-   fi
-   if [ -d ${CONST_FEATURE_DIR}/com.raytheon.viz.feature.awips.developer ]; then
-      rm -rf ${CONST_FEATURE_DIR}/com.raytheon.viz.feature.awips.developer
-   fi
-
-   # These are variables that will be placed into the environment by sourcing
-   # a shell script.
-   for feature_dir in `ls -1 ${CONST_FEATURE_DIR}`;
+   for feature in `cat ${CONST_FEATURES_TXT}`;
    do
       java -jar ${PROCESS_FEATURE_JAR} \
          -p \
-         ${CONST_FEATURE_DIR}/${feature_dir} \
+         ${CONST_FEATURE_DIR}/${feature} \
          ${CONST_SETUP_DIR_FULL}
       RC=$?
       if [ ${RC} -ne 0 ]; then
@@ -208,6 +199,7 @@ function buildFeatureRPMs()
       fi
       source ${CONST_SETUP_DIR}/feature.setup
 
+      echo "Building Feature ... ${feature}"
       rpmbuild -ba --target=${TARGET_BUILD_ARCH} \
          --define '_topdir %(echo ${AWIPSII_TOP_DIR})' \
          --define '_component_name %(echo ${COMPONENT_NAME})' \
@@ -222,7 +214,7 @@ function buildFeatureRPMs()
       RC=$?
       if [ ${RC} -ne 0 ]; then
          exit 1
-      fi
+      fi     
    done
 }