diff --git a/.gitignore b/.gitignore
index 0befdd1..0947b01 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /nibabel-2.1.0.tar.gz
 /nibabel-2.2.0.tar.gz
 /nibabel-2.3.0.tar.gz
+/nibabel-2.3.1.tar.gz
diff --git a/python-nibabel.spec b/python-nibabel.spec
index 4d34d24..ee2da1f 100644
--- a/python-nibabel.spec
+++ b/python-nibabel.spec
@@ -1,14 +1,13 @@
 %global modname nibabel
 
 Name:           python-%{modname}
-Version:        2.3.0
-Release:        3%{?dist}
+Version:        2.3.1
+Release:        1%{?dist}
 Summary:        Python package to access a cacophony of neuro-imaging file formats
 
 License:        MIT and PDDL-1.0
 URL:            http://nipy.org/nibabel/
 Source0:        https://github.com/nipy/nibabel/archive/%{version}/%{modname}-%{version}.tar.gz
-Patch0001:      0001-DOCTEST-FutureWarning-repr-changed-in-3.7.patch
 
 BuildArch:      noarch
 
@@ -62,9 +61,12 @@ information and access to the image data is made available via NumPy arrays.
 Python 3 version.
 
 %prep
-%autosetup -n %{modname}-%{version} -p1
+%autosetup -n %{modname}-%{version}
+
+# remove bundled six
 rm -vrf %{modname}/externals/six.py
 sed -i -e "s/nibabel.externals.six/six/" nibabel/externals/__init__.py
+rm -fv nibabel/externals/tests/test_six.py
 
 %build
 %py3_build
@@ -74,12 +76,13 @@ sed -i -e "s/nibabel.externals.six/six/" nibabel/externals/__init__.py
 
 %check
 # https://github.com/nipy/nibabel/issues/657
-nosetests-%{python3_version} -v || :
+nosetests-%{python3_version} -v
 
 %files -n python3-%{modname}
 %license COPYING
 %{_bindir}/parrec2nii
 %{_bindir}/nib-ls
+%{_bindir}/nib-diff
 %{_bindir}/nib-dicomfs
 %{_bindir}/nib-nifti-dx
 %{_bindir}/nib-tck2trk
@@ -88,6 +91,10 @@ nosetests-%{python3_version} -v || :
 %{python3_sitelib}/nisext/
 
 %changelog
+* Wed Nov 07 2018 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 2.3.1-1
+- Update to latest upstream release
+- Remove unneeded patch
+
 * Mon Aug 13 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 2.3.0-3
 - Drop python2 subpackage
 
diff --git a/sources b/sources
index 94ae91c..29e9456 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (nibabel-2.3.0.tar.gz) = 9d6cb394152b4e5d49ed750958077998185d78bd01386f267733276a68455024af83b98f9b1f1ca1528655bd4becaec8ded1a02141a8e7464b528ffcec607f4a
+SHA512 (nibabel-2.3.1.tar.gz) = c76d50fbefa24bcbd1a9e8365963c54b8f4ac4e842fa3d45b40184fd687d123cc1c8a1013ca0370e07f9ed9185dd0cec5036ac7c4665789c121ea8fe49157f6b