diff --git a/.gitignore b/.gitignore
index 68e1e42..705d373 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ usersguide.pdf
 /cgnslib_3.2.tar.gz
 /cgnslib_3.2.1.tar.gz
 /cgnslib-3.3.0.tar.gz
+/cgnslib-3.3.1.tar.gz
diff --git a/cgnslib-cmake.patch b/cgnslib-cmake.patch
new file mode 100644
index 0000000..bf44182
--- /dev/null
+++ b/cgnslib-cmake.patch
@@ -0,0 +1,13 @@
+diff -rupN CGNS-3.3.1/src/CMakeLists.txt CGNS-3.3.1-new/src/CMakeLists.txt
+--- CGNS-3.3.1/src/CMakeLists.txt	2017-07-17 04:32:33.000000000 +0200
++++ CGNS-3.3.1-new/src/CMakeLists.txt	2017-07-27 19:17:12.807282320 +0200
+@@ -558,7 +558,8 @@ if(CGNS_BUILD_SHARED)
+ endif(CGNS_BUILD_SHARED)
+ 
+ # Set the install path of the static library
+-install(TARGETS cgns_static ARCHIVE DESTINATION lib)
++install(TARGETS cgns_static LIBRARY DESTINATION lib
++                            ARCHIVE DESTINATION lib)
+ # Set the install path of the shared library
+ if(CGNS_BUILD_SHARED)
+   # for windows, need to install both cgnsdll.dll and cgnsdll.lib
diff --git a/cgnslib.spec b/cgnslib.spec
index 33e7e7d..10e846a 100644
--- a/cgnslib.spec
+++ b/cgnslib.spec
@@ -1,12 +1,15 @@
 Name:           cgnslib
-Version:        3.3.0
-Release:        6%{?dist}
+Version:        3.3.1
+Release:        1%{?dist}
 Summary:        Computational Fluid Dynamics General Notation System
 License:        zlib
 URL:            http://www.cgns.org/
-Source0:        https://github.com/CGNS/CGNS/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Source0:        https://github.com/CGNS/CGNS/archive/v%{version}/%{name}-%{version}.tar.gz
 # Install Fortran module into proper location
 Patch0:         cgnslib-fmod.patch
+# Fix cmake error: install TARGETS given no LIBRARY DESTINATION for shared library target
+Patch1:         cgnslib-cmake.patch
+
 BuildRequires:  cmake
 BuildRequires:  gcc-gfortran
 BuildRequires:  hdf5-devel
@@ -36,8 +39,8 @@ This package contains libraries and header files for
 developing applications that use %{name} libraries.
 
 %prep
-%setup -qn CGNS-%{version}
-%patch0 -p1 -b .fmod
+%autosetup -p1 -n CGNS-%{version}
+
 # Multi-lib path fix.
 sed -i "s|\${CMAKE_INSTALL_PREFIX}/lib|\${CMAKE_INSTALL_PREFIX}/\${LIB_INSTALL_DIR}|" CMakeLists.txt
 sed -i "s|DESTINATION lib|DESTINATION \${LIB_INSTALL_DIR}|" src/CMakeLists.txt
@@ -48,15 +51,17 @@ sed -i "s|DESTINATION lib|DESTINATION \${LIB_INSTALL_DIR}|" src/CMakeLists.txt
        -DCGNS_ENABLE_FORTRAN=ON \
        -DCGNS_BUILD_CGNSTOOLS=ON \
        -DCGNS_ENABLE_HDF5=ON
-# Parallel make can fail building fortran module
-make
+# FIXME: Ugly workaround for build order issue which results in
+# an incomplete libcgns.so being created during the first run
+make || rm src/libcgns.so* && make
+
 
 %install
 %make_install
 find %{buildroot} -name '*.a' -delete -print
 
 %check
-make test
+LD_LIBRARY_PATH=%{buildroot}%{_libdir} make test
 
 %post -p /sbin/ldconfig
 
@@ -64,7 +69,7 @@ make test
 
 %files
 %license license.txt
-%doc changelog README.md
+%doc release_docs/Release.txt README.md
 %{_bindir}/adf2hdf
 %{_bindir}/cgconfig
 %{_bindir}/cgnscalc
@@ -97,6 +102,9 @@ make test
 %{_fmoddir}/cgns.mod
 
 %changelog
+* Sat Aug 05 2017 Sandro Mani <manisandro@gmail.com> - 3.3.1-1
+- Update to 3.3.1
+
 * Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
 
diff --git a/sources b/sources
index a2dd79e..be97e55 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-64e5e8d97144c1462bee9ea6b2a81d7f  cgnslib-3.3.0.tar.gz
+SHA512 (cgnslib-3.3.1.tar.gz) = d25149b6e59d9db7c31a36967a8d035308a15b9ba884da44999673d9ced43aa60c90a5152ce9f223fb9690a4802e56dce4aaec24f6b40c1d9eea370523383c32