diff --git a/dist/comps.xml b/dist/comps.xml
index 8ae0933a0d..0b5a53ec6b 100644
--- a/dist/comps.xml
+++ b/dist/comps.xml
@@ -15,8 +15,9 @@
          <packagereq type="default">awips2-python</packagereq>
          <packagereq type="default">awips2-python-cython</packagereq>
          <packagereq type="default">awips2-python-dateutil</packagereq>
-         <packagereq type="default">awips2-python-numpy</packagereq>
+         <packagereq type="default">awips2-python-h5py</packagereq>
          <packagereq type="default">awips2-python-jep</packagereq>
+         <packagereq type="default">awips2-python-numpy</packagereq>
          <packagereq type="default">awips2-python-pyparsing</packagereq>
          <packagereq type="default">awips2-python-pytz</packagereq>
          <packagereq type="default">awips2-python-setuptools</packagereq>
@@ -62,6 +63,7 @@
          <packagereq type="default">awips2-python-pytz</packagereq>
          <packagereq type="default">awips2-python-qpid</packagereq>
          <packagereq type="default">awips2-python-scientific</packagereq>
+         <packagereq type="default">awips2-python-scipy</packagereq>
          <packagereq type="default">awips2-python-setuptools</packagereq>
          <packagereq type="default">awips2-python-shapely</packagereq>
          <packagereq type="default">awips2-python-six</packagereq>
@@ -101,6 +103,7 @@
          <packagereq type="default">awips2-python-pytz</packagereq>
          <packagereq type="default">awips2-python-qpid</packagereq>
          <packagereq type="default">awips2-python-scientific</packagereq>
+         <packagereq type="default">awips2-python-scipy</packagereq>
          <packagereq type="default">awips2-python-shapely</packagereq>
          <packagereq type="default">awips2-python-six</packagereq>
          <packagereq type="default">awips2-python-tables</packagereq>
@@ -120,7 +123,6 @@
       <uservisible>true</uservisible>
       <packagelist>
          <packagereq type="default">awips2</packagereq>
-         <packagereq type="default">awips2-cli</packagereq>
          <packagereq type="default">awips2-common-base</packagereq>
          <packagereq type="default">awips2-database</packagereq>
          <packagereq type="default">awips2-data.gfe</packagereq>
@@ -156,6 +158,7 @@
          <packagereq type="default">awips2-python-pytz</packagereq>
          <packagereq type="default">awips2-python-qpid</packagereq>
          <packagereq type="default">awips2-python-scientific</packagereq>
+         <packagereq type="default">awips2-python-scipy</packagereq>
          <packagereq type="default">awips2-python-shapely</packagereq>
          <packagereq type="default">awips2-python-six</packagereq>
          <packagereq type="default">awips2-python-tables</packagereq>
@@ -177,7 +180,6 @@
       <uservisible>true</uservisible>
       <packagelist>
          <packagereq type="default">awips2</packagereq>
-         <packagereq type="default">awips2-cli</packagereq>
          <packagereq type="default">awips2-common-base</packagereq>
          <packagereq type="default">awips2-database</packagereq>
          <packagereq type="default">awips2-data.gfe</packagereq>
@@ -214,6 +216,7 @@
          <packagereq type="default">awips2-python-pytz</packagereq>
          <packagereq type="default">awips2-python-qpid</packagereq>
          <packagereq type="default">awips2-python-scientific</packagereq>
+         <packagereq type="default">awips2-python-scipy</packagereq>
          <packagereq type="default">awips2-python-shapely</packagereq>
          <packagereq type="default">awips2-python-six</packagereq>
          <packagereq type="default">awips2-python-tables</packagereq>
@@ -248,6 +251,7 @@
          <packagereq type="default">awips2-python-pyparsing</packagereq>
          <packagereq type="default">awips2-python-pytz</packagereq>
          <packagereq type="default">awips2-python-scientific</packagereq>
+         <packagereq type="default">awips2-python-scipy</packagereq>
          <packagereq type="default">awips2-python-shapely</packagereq>
          <packagereq type="default">awips2-python-six</packagereq>
          <packagereq type="default">awips2-python-tables</packagereq>
diff --git a/rpms/build/common/lookupRPM.sh b/rpms/build/common/lookupRPM.sh
index d3640452fb..7fc58fb7b1 100644
--- a/rpms/build/common/lookupRPM.sh
+++ b/rpms/build/common/lookupRPM.sh
@@ -85,6 +85,10 @@ function lookupRPM()
       export RPM_SPECIFICATION="${installer_dir}/scientific"
       return 0
    fi
+   if [ "${1}" = "awips2-python-scipy" ]; then
+      export RPM_SPECIFICATION="${installer_dir}/scipy"
+      return 0
+   fi
    if [ "${1}" = "awips2-python-tables" ]; then
       export RPM_SPECIFICATION="${installer_dir}/tables"
       return 0
diff --git a/rpms/build/x86_64/build.sh b/rpms/build/x86_64/build.sh
index 66d315e3c4..41ddc75f1e 100644
--- a/rpms/build/x86_64/build.sh
+++ b/rpms/build/x86_64/build.sh
@@ -103,6 +103,7 @@ function build_python() {
    buildRPM "awips2-python-matplotlib"
    buildRPM "awips2-python-shapely"
    buildRPM "awips2-python-scientific"
+   buildRPM "awips2-python-scipy"
    buildRPM "awips2-python-qpid"
    buildRPM "awips2-python-werkzeug"
    buildRPM "awips2-python-cycler"
@@ -126,8 +127,8 @@ function build_server() {
    buildRPM "awips2"
    buildRPM "awips2-ldm"
    buildRPM "awips2-tools"
+   buildRPM "awips2-gfesuite"
    build_pypies
-   buildRPM "awips2-data.gfe"
    buildLocalization
 }
 function build_ade() {