diff --git a/cots/org.jivesoftware.openfire/.classpath b/cots/org.jivesoftware.openfire/.classpath
index 7e1fcb962b..28dbae849e 100644
--- a/cots/org.jivesoftware.openfire/.classpath
+++ b/cots/org.jivesoftware.openfire/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry exported="true" kind="lib" path="openfire-3.9.1.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry exported="true" kind="lib" path="openfire.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/cots/org.jivesoftware.openfire/META-INF/MANIFEST.MF b/cots/org.jivesoftware.openfire/META-INF/MANIFEST.MF
index 78d76df625..bf3330f34b 100644
--- a/cots/org.jivesoftware.openfire/META-INF/MANIFEST.MF
+++ b/cots/org.jivesoftware.openfire/META-INF/MANIFEST.MF
@@ -2,9 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Openfire
 Bundle-SymbolicName: org.jivesoftware.openfire
-Bundle-Version: 3.7.1
-Bundle-ClassPath: openfire.jar
-Export-Package: com.cenqua.shaj,
+Bundle-Version: 3.9.1
+Bundle-ClassPath: openfire-3.9.1.jar
+Export-Package: .,
+ com.cenqua.shaj,
  com.cenqua.shaj.log,
  com.googlecode.concurrentlinkedhashmap,
  com.jcraft.jzlib,
@@ -37,13 +38,6 @@ Export-Package: com.cenqua.shaj,
  com.sun.syndication.fetcher.samples,
  com.sun.syndication.io,
  com.sun.syndication.io.impl,
- de.javawi.jstun,
- de.javawi.jstun.attribute,
- de.javawi.jstun.header,
- de.javawi.jstun.test,
- de.javawi.jstun.test.demo,
- de.javawi.jstun.test.demo.ice,
- de.javawi.jstun.util,
  gnu.inet.encoding,
  javax.jmdns,
  javax.servlet.jsp,
@@ -111,6 +105,7 @@ Export-Package: com.cenqua.shaj,
  org.apache.mina.handler.demux,
  org.apache.mina.handler.multiton,
  org.apache.mina.handler.support,
+ org.apache.mina.integration.jmx,
  org.apache.mina.management,
  org.apache.mina.transport.socket.nio,
  org.apache.mina.transport.socket.nio.support,
@@ -156,27 +151,38 @@ Export-Package: com.cenqua.shaj,
  org.dom4j.xpp,
  org.eclipse.jetty.continuation,
  org.eclipse.jetty.http,
+ org.eclipse.jetty.http.gzip,
  org.eclipse.jetty.http.security,
  org.eclipse.jetty.http.ssl,
  org.eclipse.jetty.io,
  org.eclipse.jetty.io.bio,
  org.eclipse.jetty.io.nio,
+ org.eclipse.jetty.jmx,
  org.eclipse.jetty.security,
  org.eclipse.jetty.security.authentication,
  org.eclipse.jetty.server,
  org.eclipse.jetty.server.bio,
  org.eclipse.jetty.server.handler,
+ org.eclipse.jetty.server.handler.jmx,
+ org.eclipse.jetty.server.jmx,
  org.eclipse.jetty.server.nio,
  org.eclipse.jetty.server.session,
+ org.eclipse.jetty.server.session.jmx,
  org.eclipse.jetty.server.ssl,
  org.eclipse.jetty.servlet,
+ org.eclipse.jetty.servlet.api,
+ org.eclipse.jetty.servlet.jmx,
+ org.eclipse.jetty.servlet.listener,
  org.eclipse.jetty.util,
  org.eclipse.jetty.util.ajax,
  org.eclipse.jetty.util.component,
  org.eclipse.jetty.util.log,
  org.eclipse.jetty.util.resource,
+ org.eclipse.jetty.util.security,
+ org.eclipse.jetty.util.statistic,
  org.eclipse.jetty.util.thread,
  org.eclipse.jetty.webapp,
+ org.eclipse.jetty.websocket,
  org.eclipse.jetty.xml,
  org.jaxen,
  org.jaxen.dom,
@@ -222,6 +228,8 @@ Export-Package: com.cenqua.shaj,
  org.jivesoftware.openfire.commands.event,
  org.jivesoftware.openfire.component,
  org.jivesoftware.openfire.container,
+ org.jivesoftware.openfire.crowd,
+ org.jivesoftware.openfire.crowd.jaxb,
  org.jivesoftware.openfire.disco,
  org.jivesoftware.openfire.entitycaps,
  org.jivesoftware.openfire.event,
@@ -245,6 +253,7 @@ Export-Package: com.cenqua.shaj,
  org.jivesoftware.openfire.pep,
  org.jivesoftware.openfire.privacy,
  org.jivesoftware.openfire.pubsub,
+ org.jivesoftware.openfire.pubsub.cluster,
  org.jivesoftware.openfire.pubsub.models,
  org.jivesoftware.openfire.resultsetmanager,
  org.jivesoftware.openfire.roster,
@@ -255,7 +264,6 @@ Export-Package: com.cenqua.shaj,
  org.jivesoftware.openfire.spi,
  org.jivesoftware.openfire.starter,
  org.jivesoftware.openfire.stats,
- org.jivesoftware.openfire.stun,
  org.jivesoftware.openfire.transport,
  org.jivesoftware.openfire.update,
  org.jivesoftware.openfire.user,
diff --git a/cots/org.jivesoftware.openfire/build.properties b/cots/org.jivesoftware.openfire/build.properties
index a6cdffd512..39feddf528 100644
--- a/cots/org.jivesoftware.openfire/build.properties
+++ b/cots/org.jivesoftware.openfire/build.properties
@@ -1,2 +1,2 @@
 bin.includes = META-INF/,\
-               openfire.jar
+               openfire-3.9.1.jar
diff --git a/cots/org.jivesoftware.openfire/openfire-3.9.1.jar b/cots/org.jivesoftware.openfire/openfire-3.9.1.jar
new file mode 100644
index 0000000000..7eeec722ad
Binary files /dev/null and b/cots/org.jivesoftware.openfire/openfire-3.9.1.jar differ
diff --git a/cots/org.jivesoftware.openfire/openfire.jar b/cots/org.jivesoftware.openfire/openfire.jar
deleted file mode 100644
index d12dcdffba..0000000000
Binary files a/cots/org.jivesoftware.openfire/openfire.jar and /dev/null differ
diff --git a/javaUtilities/build.openfire.plugin/build.xml b/javaUtilities/build.openfire.plugin/build.xml
index dc32582123..769ab40fbe 100644
--- a/javaUtilities/build.openfire.plugin/build.xml
+++ b/javaUtilities/build.openfire.plugin/build.xml
@@ -1,7 +1,7 @@
 <project default="build" basedir=".">
 	<!-- private static variables -->
 	<property name="openfire.src"
-		value="openfire_src_3_7_1.tar.gz" />
+		value="openfire_src_3_9_1.tar.gz" />
 	<property name="openfire.src.dir"
 		value="${basedir}/tmp/build/openfire_src" />	
 	<property name="baseline.dir"
@@ -10,6 +10,10 @@
 	<!-- optional command-line parameters -->
 	<property name="destination.directory"
 		value="" />
+	<property name="awipscm.dir" 
+		value="/awipscm" />
+	<property name="openfire.tar.dir" 
+        value="${awipscm.dir}/awips2-static/foss/openfire" />
 	
 	<target name="clean">
 		<!-- Remove artifacts from a previous build, if they exist. -->
@@ -26,10 +30,21 @@
 	<target name="init" depends="clean">
 		<!-- Unpack the source in a temporary directory. -->
 		<mkdir dir="${basedir}/tmp/build" />
+		<if>
+			<not>
+			<available file="/tmp/openfire-build/${openfire.src}" 
+				type="file" />
+			</not>
+			<then>
+				<copy file="${openfire.tar.dir}/${openfire.src}" 
+					todir="/tmp/openfire-build" />
+			</then>
+			
+		</if>
 		<!-- since untar is not working in this version of ant. -->
 		<exec executable="/bin/tar">
 			<arg value="-xf" />
-			<arg value="${basedir}/src/${openfire.src}" />
+			<arg value="/tmp/openfire-build/${openfire.src}" />
 			<arg value="-C" />
 			<arg value="${basedir}/tmp/build" />
 		</exec>
diff --git a/javaUtilities/build.openfire.plugin/src/openfire_src_3_7_1.tar.gz.REMOVED.git-id b/javaUtilities/build.openfire.plugin/src/openfire_src_3_7_1.tar.gz.REMOVED.git-id
deleted file mode 100644
index a815ce8fbb..0000000000
--- a/javaUtilities/build.openfire.plugin/src/openfire_src_3_7_1.tar.gz.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-beeea06bd8eedd0a1a4f03c83507adff749d488f
\ No newline at end of file
diff --git a/javaUtilities/com.raytheon.openfire.plugin.configuration.collaboration/META-INF/MANIFEST.MF b/javaUtilities/com.raytheon.openfire.plugin.configuration.collaboration/META-INF/MANIFEST.MF
index fe75e4a140..dc08a36b2c 100644
--- a/javaUtilities/com.raytheon.openfire.plugin.configuration.collaboration/META-INF/MANIFEST.MF
+++ b/javaUtilities/com.raytheon.openfire.plugin.configuration.collaboration/META-INF/MANIFEST.MF
@@ -5,6 +5,6 @@ Bundle-SymbolicName: com.raytheon.openfire.plugin.configuration.collaboration;si
 Bundle-Version: 1.14.0
 Bundle-Vendor: RAYTHEON
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.jivesoftware.openfire;bundle-version="3.7.1",
- org.apache.commons.collections;bundle-version="3.2.0",
- org.apache.http;bundle-version="4.1.2"
+Require-Bundle: org.jivesoftware.openfire,
+ org.apache.commons.collections,
+ org.apache.http