diff --git a/.gitignore b/.gitignore
index 4fb094b..0f71b60 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ activemq-cpp-library-3.2.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
+/activemq-cpp-library-3.9.4-src.tar.gz
diff --git a/activemq-cpp-openssl1.patch b/activemq-cpp-openssl1.patch
new file mode 100644
index 0000000..5aa216c
--- /dev/null
+++ b/activemq-cpp-openssl1.patch
@@ -0,0 +1,18 @@
+--- activemq-cpp-library-3.8.4-clean/src/main/decaf/internal/net/ssl/openssl/OpenSSLSocket.cpp	2017-10-24 09:21:39.284236953 +0100
++++ activemq-cpp-library-3.8.4-clean/src/main/decaf/internal/net/ssl/openssl/OpenSSLSocket.cpp	2017-10-24 09:24:46.925846965 +0100
+@@ -664,11 +664,12 @@ 
+                 break;
+             }
+ 
+-            const unsigned char* data = extension->value->data;
++            const unsigned char* data = ASN1_STRING_data(X509_EXTENSION_get_data(extension));
++            const size_t length = ASN1_STRING_length(X509_EXTENSION_get_data(extension));
+             STACK_OF(CONF_VALUE)* confValue = method->i2v(method,
+                     method->it ?
+-                            ASN1_item_d2i(NULL, &data, extension->value->length, ASN1_ITEM_ptr(method->it)) :
+-                            method->d2i(NULL, &data, extension->value->length), NULL);
++                            ASN1_item_d2i(NULL, &data, length, ASN1_ITEM_ptr(method->it)) :
++                            method->d2i(NULL, &data, length), NULL);
+ 
+             CONF_VALUE* value = NULL;
+ 
diff --git a/activemq-cpp.spec b/activemq-cpp.spec
index eb400fb..f255579 100644
--- a/activemq-cpp.spec
+++ b/activemq-cpp.spec
@@ -1,8 +1,8 @@
 %global with_docs 0
 
 Name:           activemq-cpp
-Version:        3.8.4
-Release:        8%{?dist}
+Version:        3.9.4
+Release:        1%{?dist}
 Summary:        C++ implementation of JMS-like messaging client
 
 Group:          Development/Libraries
@@ -12,6 +12,9 @@ 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
+# Openssl 1.1.0
+# http://activemq.2283324.n4.nabble.com/activemq-cpp-3-9-4-fails-to-build-fedora-rawhide-openssl-1-1-0e-related-td4724037.html
+Patch2:         activemq-cpp-openssl1.patch
 
 BuildRequires:  openssl-devel
 BuildRequires:  zlib-devel
@@ -79,6 +82,7 @@ rm -r src/main/decaf/internal/util/zip
 %if %{?with_docs}0
 %patch1 -p1
 %endif
+%patch2 -p1
 chmod 644 LICENSE.txt
 chmod 644 src/main/activemq/transport/mock/MockTransport.cpp
 
@@ -129,6 +133,10 @@ make %{?_smp_mflags} check
 %endif
 
 %changelog
+* Fri Apr 13 2018 Steve Traylen <steve.traylen@cern.ch> - 3.9.4-1
+- New from upstream
+- Add patch for openssl1
+
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.4-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 
diff --git a/sources b/sources
index cfbed06..1262ac0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7df2becbb778af40b58c3109e18fdf32  activemq-cpp-library-3.8.4-src.tar.gz
+SHA512 (activemq-cpp-library-3.9.4-src.tar.gz) = 58b71acba98034578819ea0b63ca6d90168d6231e24a1d9d6a42d54ca7b7be5cf6eb82054c50ea4c3f29a2f0155433f2886226e4910ed8621474bd1315050f13