diff --git a/build/rsync.cave b/build/rsync.cave
new file mode 100644
index 0000000000..4d708a13d7
--- /dev/null
+++ b/build/rsync.cave
@@ -0,0 +1,45 @@
+edexOsgi/* cave/* localization/*
+javaUtilities/* rpms pythonPackages 
+*.pdf
+../awips2-nativelib/*
+../awips2-core/common/* 
+../awips2-core/edex/* 
+../awips2-core/features/* 
+../awips2-core/viz/*
+../awips2-core-foss/lib/*
+../awips2-foss/lib/*
+../awips2-hazards/edex/*
+../awips2-hazards/common/*
+../awips2-hazards/viz/*
+../awips2-ncep/common/* 
+../awips2-ncep/viz/* 
+../awips2-ncep/features/* 
+../awips2-ncep/edex/* 
+../awips2-goesr/edexOsgi/* 
+../awips2-goesr/cave/* 
+../awips2-unidata/*
+../python-awips
+../awips2-cimss/viz/*
+../awips2-cimss/edex/*
+../awips2-cimss/features/*
+../awips2-cimss/common/*
+../awips2-data-delivery/common/*
+../awips2-data-delivery/edex/*
+../awips2-data-delivery/features/*
+../awips2-data-delivery/viz/*
+../awips2-drawing/viz/*
+../awips2-drawing/features/*
+../awips2-gsd/viz/*
+../awips2-gsd/features/*
+../awips2-nasa/edex/*
+../awips2-ogc/foss/*
+../awips2-ogc/edex/*
+../awips2-ogc/features/*
+../awips2-ohd/edex/*
+../awips2-ohd/apps/*
+../awips2-ohd/features/*
+../awips2-ohd/lib/*
+../awips2-swpc/common/*
+../awips2-swpc/edex/*
+../awips2-swpc/viz/*
+../awips2-swpc/features/*
diff --git a/build/rsync.dirs b/build/rsync.dirs
index 36bec06f0a..ad08ff741c 100644
--- a/build/rsync.dirs
+++ b/build/rsync.dirs
@@ -10,10 +10,6 @@ javaUtilities/* rpms pythonPackages
 ../awips2-foss/lib/*
 ../awips2-rpm/foss
 ../awips2-rpm/installers
-../awips2-nws/common/* 
-../awips2-nws/viz/* 
-../awips2-nws/features/*
-../awips2-nws/edex/* 
 ../awips2-hazards/edex/*
 ../awips2-hazards/common/*
 ../awips2-hazards/viz/*
@@ -29,10 +25,6 @@ javaUtilities/* rpms pythonPackages
 ../awips2-cimss/edex/*
 ../awips2-cimss/features/*
 ../awips2-cimss/common/*
-../awips2-collaboration/viz/*
-../awips2-collaboration/features/*
-../awips2-collaboration/common/*
-../awips2-collaboration/foss/*
 ../awips2-data-delivery/common/*
 ../awips2-data-delivery/edex/*
 ../awips2-data-delivery/features/*
diff --git a/edexOsgi/build.edex/build.xml b/edexOsgi/build.edex/build.xml
index 4b89994079..f7d5757a9c 100644
--- a/edexOsgi/build.edex/build.xml
+++ b/edexOsgi/build.edex/build.xml
@@ -36,7 +36,7 @@
 		into com.raytheon.uf.edex.dataplugins.feature
 
 		-->
-
+		<!-- required builds -->
         	<antcall target="build">
 			<param name="feature"
 				value="com.raytheon.uf.common.base.feature" />
@@ -60,7 +60,8 @@
 		<antcall target="build">
 			<param name="feature"
 				value="com.raytheon.uf.edex.dataplugins.feature" />
-		</antcall> <!--
+		</antcall>
+		<!-- optional builds -->
 		<antcall target="build">
 			<param name="feature"
 				value="com.raytheon.uf.edex.ogc.feature" />
@@ -87,8 +88,9 @@
 		</antcall>
 		<antcall target="build">
 			<param name="feature"
-				value="edu.ucar.unidata.uf.edex.unidata.feature" />
-		</antcall> -->
+				value="edu.ucar.unidata.edex.feature" />
+		</antcall>
+		<!-- end optional builds -->
 	</target>
 
     <target name="main" depends="clean, init, main-build" />