diff --git a/rpms/awips2.qpid/0.18/SOURCES/awips.patch b/rpms/awips2.qpid/0.18/SOURCES/awips.patch
index 8c27aa4880..1958e1a6af 100644
--- a/rpms/awips2.qpid/0.18/SOURCES/awips.patch
+++ b/rpms/awips2.qpid/0.18/SOURCES/awips.patch
@@ -62,7 +62,7 @@ diff -crB a/qpid/java/build.deps b/qpid/java/build.deps
 ***************
 *** 19,29 ****
   
-  commons-beanutils-core=lib/required/commons-beanutils-core-1.8.3.jar
+! commons-beanutils-core=lib/required/commons-beanutils-core-1.8.3.jar
   commons-cli=lib/required/commons-cli-1.2.jar
 ! commons-codec=lib/required/commons-codec-1.6.jar
   commons-collections=lib/required/commons-collections-3.2.1.jar
@@ -74,7 +74,7 @@ diff -crB a/qpid/java/build.deps b/qpid/java/build.deps
   derby-db=lib/required/derby-10.8.2.2.jar
 --- 19,29 ----
   
-  commons-beanutils-core=lib/required/commons-beanutils-core-1.8.3.jar
+! commons-beanutils-core=lib/required/commons-beanutils-1.8.3.jar
   commons-cli=lib/required/commons-cli-1.2.jar
 ! commons-codec=lib/required/commons-codec-1.4.jar
   commons-collections=lib/required/commons-collections-3.2.1.jar
diff --git a/rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0 b/rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0
index 1869abe0dd..eb6c7f4d93 100644
--- a/rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0
+++ b/rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0
@@ -1,6 +1,6 @@
 diff -crB a/qpid-java.spec b/qpid-java.spec
 *** a/qpid-java.spec	2013-01-28 10:36:50.000000000 -0600
---- b/qpid-java.spec	2013-01-28 10:37:47.000000000 -0600
+--- b/qpid-java.spec	2013-02-04 10:47:12.000000000 -0600
 ***************
 *** 1,3 ****
 --- 1,5 ----
@@ -80,12 +80,19 @@ diff -crB a/qpid-java.spec b/qpid-java.spec
   
       # blacklisted jars are either provided by the Requires: or not needed.
       BLACKLIST="slf4j qpid-client-tests qpid-all qpid-common-tests"
---- 99,106 ----
+--- 99,113 ----
   
   (
       cd %{qpid_src_dir}/java
+!     for module in ${QPID_MODULES[*]}; do
+!        ant -Dretrieve.dependencies=false \
+!            -Dmodules=${module}
+!     done
 !     ant -Dretrieve.dependencies=false \
-! 	-Dmodules=common\ client\ amqp-1-0-common\ amqp-1-0-client\ amqp-1-0-client-jms\ management/common\ broker
+!        -Dmodules=common\ client\ amqp-1-0-common\ amqp-1-0-client\ amqp-1-0-client-jms\ management/common\ broker\ jca\ systests\ broker-plugins/management-jmx
+!     if [ $? -ne 0 ]; then
+!        exit 1
+!     fi
   
       # blacklisted jars are either provided by the Requires: or not needed.
       BLACKLIST="slf4j qpid-client-tests qpid-all qpid-common-tests"
@@ -138,7 +145,7 @@ diff -crB a/qpid-java.spec b/qpid-java.spec
   
   %changelog
   * Thu Sep  6 2012 Irina Boverman <iboverma@redhat.com> - 0.18-2
---- 114,216 ----
+--- 121,235 ----
   
   cd ..
   
@@ -155,6 +162,14 @@ diff -crB a/qpid-java.spec b/qpid-java.spec
 ! 	%{buildroot}%{_awips2_directory}/lib/opt
 ! install -pm 644 %{qpid_src_dir}/java/build/lib/qpid-broker-%{version}-sources.jar \
 ! 	%{buildroot}%{_awips2_directory}/lib/opt
+! install -pm 644 %{qpid_src_dir}/java/build/lib/qpid-management-common-%{version}.jar \
+!         %{buildroot}%{_awips2_directory}/lib/opt
+! install -pm 644 %{qpid_src_dir}/java/build/lib/qpid-management-common-%{version}-sources.jar \
+!         %{buildroot}%{_awips2_directory}/lib/opt
+! install -pm 644 %{qpid_src_dir}/java/build/lib/plugins/qpid-broker-plugins-management-jmx-%{version}.jar \
+!         %{buildroot}%{_awips2_directory}/lib/opt
+! install -pm 644 %{qpid_src_dir}/java/build/lib/qpid-broker-plugins-management-jmx-%{version}-sources.jar \
+!         %{buildroot}%{_awips2_directory}/lib/opt
 ! 
 ! # scripts for broker
 ! install -dm 755 %{buildroot}%{_awips2_directory}/bin
@@ -208,6 +223,8 @@ diff -crB a/qpid-java.spec b/qpid-java.spec
 ! %dir /awips2/qpid/lib/opt
 ! /awips2/qpid/lib/opt/qpid-common-%{version}.jar
 ! /awips2/qpid/lib/opt/qpid-common-%{version}-sources.jar
+! /awips2/qpid/lib/opt/qpid-management-common-%{version}.jar
+! /awips2/qpid/lib/opt/qpid-management-common-%{version}-sources.jar
 ! %dir /awips2/qpid/lib/opt/qpid-deps
 ! /awips2/qpid/lib/opt/qpid-deps/*
 ! %doc /awips2/qpid/LICENSE
@@ -228,6 +245,8 @@ diff -crB a/qpid-java.spec b/qpid-java.spec
 ! %dir /awips2/qpid/lib/opt
 ! /awips2/qpid/lib/opt/qpid-broker-%{version}.jar
 ! /awips2/qpid/lib/opt/qpid-broker-%{version}-sources.jar
+! /awips2/qpid/lib/opt/qpid-broker-plugins-management-jmx-%{version}.jar
+! /awips2/qpid/lib/opt/qpid-broker-plugins-management-jmx-%{version}-sources.jar
 ! %defattr(755,awips,fxalpha,755)
 ! %dir /awips2/qpid/bin
 ! /awips2/qpid/bin/*