diff --git a/rpms/awips2.qpid/0.18/SOURCES/awips.patch b/rpms/awips2.qpid/0.18/SOURCES/awips.patch
index 96bbba94f0..9b13adece4 100644
--- a/rpms/awips2.qpid/0.18/SOURCES/awips.patch
+++ b/rpms/awips2.qpid/0.18/SOURCES/awips.patch
@@ -40,22 +40,24 @@ diff -crB a/qpid/java/broker/bin/qpid-server b/qpid/java/broker/bin/qpid-server
   
   # Set to help us get round the manifold problems of ps/pgrep on various
 ***************
-*** 34,40 ****
+*** 34,41 ****
   fi
   
   # Set classpath to include the qpid-all manifest jar, and any jars supplied in lib/opt
 ! QPID_LIBS="$QPID_HOME/lib/qpid-all.jar:$QPID_HOME/lib/opt/*"
   
   # Set other variables used by the qpid-run script before calling
-  export JAVA=java \
---- 33,39 ----
+! export JAVA=java \
+         JAVA_VM=-server \
+--- 33,40 ----
   fi
   
   # Set classpath to include the qpid-all manifest jar, and any jars supplied in lib/opt
 ! QPID_LIBS="$QPID_HOME/lib/qpid-all.jar:$QPID_HOME/lib/opt/*:$QPID_HOME/lib/opt/qpid-deps/*"
   
   # Set other variables used by the qpid-run script before calling
-  export JAVA=java \
+! export JAVA=/awips2/java/bin/java \
+         JAVA_VM=-server \
 diff -crB a/qpid/java/build.deps b/qpid/java/build.deps
 *** a/qpid/java/build.deps	2013-01-23 13:54:15.000000000 -0600
 --- b/qpid/java/build.deps	2013-01-23 13:52:28.000000000 -0600
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 1b18ebe1f7..dc0804bc08 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-02-11 15:05:10.000000000 -0600
+*** a/qpid-java.spec	2013-03-28 13:52:58.000000000 -0500
+--- b/qpid-java.spec	2013-03-28 14:47:41.000000000 -0500
 ***************
 *** 1,3 ****
 --- 1,5 ----
@@ -171,13 +171,11 @@ diff -crB a/qpid-java.spec b/qpid-java.spec
 ! install -dm 755 %{buildroot}%{_awips2_directory}/bin
 ! install -pm 644 %{qpid_src_dir}/java/build/bin/* %{buildroot}%{_awips2_directory}/bin
 ! 
-! install -dm 755 %{buildroot}%{_awips2_directory}/lib/opt/qpid-deps
-! install -pm 644 %{qpid_src_dir}/java/build/lib/qpid-deps-%{version}.jar \
-! 	%{buildroot}%{_awips2_directory}/lib/opt/qpid-deps
-! 
 ! # service script
 ! mkdir -p %{buildroot}/etc/init.d
 ! install -pm 755 %SOURCE5 %{buildroot}/etc/init.d
+! # logs directory
+! mkdir -p %{buildroot}%{_awips2_directory}/log
 ! 
 ! # qpid configuration
 ! install -dm 755 %{buildroot}%{_awips2_directory}/etc
@@ -188,6 +186,7 @@ diff -crB a/qpid-java.spec b/qpid-java.spec
 ! install -pm 644 %SOURCE4 %{buildroot}%{_awips2_directory}/etc
 ! 
 ! # foss dependencies
+! install -dm 755 %{buildroot}%{_awips2_directory}/lib/opt/qpid-deps
 ! install -pm 644 %{qpid_src_dir}/java/lib/required/*.jar \
 ! 	%{buildroot}%{_awips2_directory}/lib/opt/qpid-deps
 ! 
@@ -241,6 +240,7 @@ diff -crB a/qpid-java.spec b/qpid-java.spec
 ! /awips2/qpid/lib/opt/qpid-broker-plugins-access-control-%{version}.jar
 ! /awips2/qpid/lib/opt/qpid-broker-plugins-firewall-%{version}.jar
 ! /awips2/qpid/lib/opt/qpid-broker-plugins-management-http-%{version}.jar
+! %dir /awips2/qpid/log
 ! %defattr(755,awips,fxalpha,755)
 ! %dir /awips2/qpid/bin
 ! /awips2/qpid/bin/*