diff --git a/.gitignore b/.gitignore
index e48eb12..4fb094b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ activemq-cpp-library-3.2.1-src.tar.gz
 /activemq-cpp-library-3.7.1-src.tar.gz
 /activemq-cpp-library-3.8.2-src.tar.gz
 /activemq-cpp-library-3.8.3-src.tar.gz
+/activemq-cpp-library-3.8.4-src.tar.gz
diff --git a/activemq-cpp.spec b/activemq-cpp.spec
index fe241a8..0c19b0c 100644
--- a/activemq-cpp.spec
+++ b/activemq-cpp.spec
@@ -1,7 +1,7 @@
 %global with_docs 0
 
 Name:           activemq-cpp
-Version:        3.8.3
+Version:        3.8.4
 Release:        1%{?dist}
 Summary:        C++ implementation of JMS-like messaging client
 
@@ -12,27 +12,17 @@ Source0:        http://www.apache.org/dist/activemq/activemq-cpp/%{version}/acti
 Patch0:         activemq-cpp-3.8.2-system-zlib.patch
 # Some local texmf configuration to increase default pool_size.
 Patch1:         activemq-cpp-local-texmf.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  openssl-devel
 BuildRequires:  zlib-devel
 %if %{?with_docs}0
 BuildRequires:  doxygen
 BuildRequires:  graphviz
-%if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6
 BuildRequires:  tex(latex)
-%else
-BuildRequires:  tetex-latex
-%endif
-%endif
-BuildRequires:  apr-util-devel%{?_isa} >= 1.3
-BuildRequires:  cppunit-devel%{?_isa} >= 1.10.2
-
-%if %{?fedora}%{!?fedora:0} >= 12 || %{?rhel}%{!?rhel:0} >= 6
-BuildRequires:  libuuid-devel%{?_isa}
-%else
-BuildRequires:  e2fsprogs-devel%{?_isa}
 %endif
+BuildRequires:  apr-util-devel >= 1.3
+BuildRequires:  cppunit-devel >= 1.10.2
+BuildRequires:  libuuid-devel
 
 %description
 activemq-cpp is a JMS-like API for C++ for interfacing with Message 
@@ -48,9 +38,9 @@ Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       pkgconfig
 %if %{?fedora}%{!?fedora:0} >= 12 || %{?rhel}%{!?rhel:0} >= 6
-Requires:  libuuid-devel%{?_isa}
+Requires:  libuuid-devel
 %else
-Requires:  e2fsprogs-devel%{?_isa}
+Requires:  e2fsprogs-devel
 %endif
 
 %description devel
@@ -142,7 +132,10 @@ make %{?_smp_mflags} check
 %endif
 
 %changelog
-* Wed Aug 27 2014 Steve Traylen <steve.traylen@cern.ch> - 3.8.4-1
+* Wed Mar 11 2015 Steve Traylen <steve.traylen@cern.ch> - 3.8.4-1
+- Upstream to 3.8.4
+
+* Wed Aug 27 2014 Steve Traylen <steve.traylen@cern.ch> - 3.8.3-1
 - Upstream to 3.8.3
 
 * Fri Aug 15 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.8.2-4
diff --git a/sources b/sources
index c2c7455..cfbed06 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-065a9ea9b279e512cd96a985869bd697  activemq-cpp-library-3.8.3-src.tar.gz
+7df2becbb778af40b58c3109e18fdf32  activemq-cpp-library-3.8.4-src.tar.gz