diff --git a/.gitignore b/.gitignore
index b7c21d0..d4f0a29 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ commons-math-2.0-src.tar.gz
 /commons-math3-3.3-src.tar.gz
 /commons-math3-3.4-src.tar.gz
 /commons-math3-3.4.1-src.tar.gz
+/commons-math3-3.6.1-src.tar.gz
diff --git a/apache-commons-math.spec b/apache-commons-math.spec
index b3cf2a3..2f3d131 100644
--- a/apache-commons-math.spec
+++ b/apache-commons-math.spec
@@ -1,20 +1,15 @@
 %global short_name commons-math3
 
 Name:             apache-commons-math
-Version:          3.4.1
-Release:          11%{?dist}
+Version:          3.6.1
+Release:          1%{?dist}
 Summary:          Java library of lightweight mathematics and statistics components
 License:          ASL 1.1 and ASL 2.0 and BSD
 URL:              http://commons.apache.org/math/
 Source0:          http://www.apache.org/dist/commons/math/source/%{short_name}-%{version}-src.tar.gz
-# Fix random build self-test failures reported on RHBZ #1402145 (see
-# https://git1-us-west.apache.org/repos/asf?p=commons-math.git;a=commit;h=a9006aa)
-Patch1:           %{name}-3.4.1-RHBZ1402145.patch
 
-BuildRequires:    java-devel >= 1:1.6.0
-BuildRequires:    jpackage-utils
+BuildRequires:    java-devel
 BuildRequires:    maven-local
-
 BuildRequires:    mvn(org.apache.commons:commons-parent:pom:)
 Requires:         jpackage-utils
 BuildArch:        noarch
@@ -39,9 +34,6 @@ This package contains the API documentation for %{name}.
 %mvn_alias "org.apache.commons:%{short_name}" "%{short_name}:%{short_name}"
 %mvn_file :%{short_name} %{short_name} %{name}
 
-# Disable maven-jgit-buildnumber-plugin plugin (not available in Fedora)
-%pom_remove_plugin ru.concerteza.buildnumber:maven-jgit-buildnumber-plugin
-
 
 %build
 %mvn_build
@@ -52,14 +44,19 @@ This package contains the API documentation for %{name}.
 
 
 %files -f .mfiles
-%doc LICENSE.txt NOTICE.txt RELEASE-NOTES.txt
+%doc NOTICE.txt RELEASE-NOTES.txt
+%license LICENSE.txt
 
 
 %files javadoc -f .mfiles-javadoc
-%doc LICENSE.txt NOTICE.txt
+%doc NOTICE.txt
+%license LICENSE.txt
 
 
 %changelog
+* Fri Aug 09 2019 Mohamed El Morabity <melmorabity@fedoraproject.org> - 3.6.1-1
+- Update to 3.6.1
+
 * Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.1-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
diff --git a/sources b/sources
index 162ede0..50c46f7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (commons-math3-3.4.1-src.tar.gz) = 21c926870ebc40e9594750545299005c53782efac4e411db773253db95cf3e6fbf770da1e52db2b88676310d1ecffc9b5fd28c03b2acbfe126f87b4f67718866
+SHA512 (commons-math3-3.6.1-src.tar.gz) = cd3d4736257999bb1affd0a3d9e86be983c24651e074c9819d85770a37cf1bd3f9a809e426a41036ba3fc10e992f7d164685b964b9cda05b6c9b7a70f62d237b