diff --git a/rpms/awips2.edex/Installer.edex/component.spec b/rpms/awips2.edex/Installer.edex/component.spec
index ba9327c6e4..16d871c1cf 100644
--- a/rpms/awips2.edex/Installer.edex/component.spec
+++ b/rpms/awips2.edex/Installer.edex/component.spec
@@ -57,8 +57,7 @@ if [ $? -ne 0 ]; then
    exit 1
 fi
 
-# Unidata programs 'edex' and 'qpidNotify.py'
-/bin/cp -r %{_baseline_workspace}/rpms/awips2.edex/Installer.edex/programs/* ${RPM_BUILD_ROOT}/awips2/edex/bin/
+/bin/cp -r %{_baseline_workspace}/rpms/awips2.edex/Installer.edex/programs/qpidNotify.py ${RPM_BUILD_ROOT}/awips2/edex/bin/
 
 DEPLOY_SCRIPT="deploy.edex.awips2/deploy/deploy-esb-configuration.xml"
 # use deploy-install to deploy edex-configuration.
@@ -159,6 +158,5 @@ rm -rf ${RPM_BUILD_ROOT}
 %defattr(755,awips,fxalpha,755)
 %dir /awips2/edex/bin
 /awips2/edex/bin/*.sh
-%attr(755,awips,fxalpha) /awips2/edex/bin/edex
 %attr(755,awips,fxalpha) /awips2/edex/bin/qpidNotify.py
 %attr(744,root,root) /etc/init.d/*
diff --git a/rpms/awips2.upc/Installer.awips/component.spec b/rpms/awips2.upc/Installer.awips/component.spec
index c582d310e0..94aea110f6 100644
--- a/rpms/awips2.upc/Installer.awips/component.spec
+++ b/rpms/awips2.upc/Installer.awips/component.spec
@@ -42,11 +42,17 @@ fi
 %build
 
 %install
+mkdir -p %{_build_root}/usr/bin
+if [ $? -ne 0 ]; then
+   exit 1
+fi
+
 mkdir -p ${RPM_BUILD_ROOT}/etc/profile.d
 if [ $? -ne 0 ]; then
    exit 1
 fi
 
+/bin/cp -r %{_baseline_workspace}/rpms/awips2.upc/Installer.awips/programs/edex ${RPM_BUILD_ROOT}/usr/bin/
 /bin/cp %{_baseline_workspace}/rpms/awips2.upc/Installer.awips/scripts/profile.d/* ${RPM_BUILD_ROOT}/etc/profile.d
 
 
@@ -60,5 +66,6 @@ fi
 rm -rf ${RPM_BUILD_ROOT}/*
 
 %files
+%attr(755,awips,fxalpha) /usr/bin/edex
 %attr(755,root,root) /etc/profile.d/awips2.csh
 %attr(755,root,root) /etc/profile.d/awips2.sh
diff --git a/rpms/awips2.edex/Installer.edex/programs/edex b/rpms/awips2.upc/Installer.awips/programs/edex
similarity index 99%
rename from rpms/awips2.edex/Installer.edex/programs/edex
rename to rpms/awips2.upc/Installer.awips/programs/edex
index 936ebc89a5..758ec79ae4 100755
--- a/rpms/awips2.edex/Installer.edex/programs/edex
+++ b/rpms/awips2.upc/Installer.awips/programs/edex
@@ -363,10 +363,10 @@ edex_purge_reset() {
         su - awips -c 'psql metadata -c "update purgejobs set failedcount = 0;"' >& /dev/null
 }
 edex_qpid() {
-   su - awips -c "qpid-stat -q -S msgIn"
+	qpid-stat -q -S msgIn
 }
 edex_cleanup() {
-   rm -rf /awips2/qpid/edexMessageStore/edex/
+	rm -rf /awips2/qpid/edexMessageStore/edex/
 }
 edex_users(){
         if [ "${args[1]}" != '' ]; then