diff --git a/Audacity-2.1.3.tar.gz b/Audacity-2.1.3.tar.gz
deleted file mode 100644
index 6c75a9c..0000000
--- a/Audacity-2.1.3.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cb30870b93c7f6f90b2ec70807ab6dcd9c3a3a29015478ae7b19af46d63bbd86
-size 24106855
diff --git a/Audacity-2.2.0.tar.gz b/Audacity-2.2.0.tar.gz
new file mode 100644
index 0000000..7efdd34
--- /dev/null
+++ b/Audacity-2.2.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3e4b6861f45885e4c90db62eb479cab2a9361e1ebb0c567bf8362a2b17c9b727
+size 25167947
diff --git a/audacity-no_return_in_nonvoid.patch b/audacity-no_return_in_nonvoid.patch
new file mode 100644
index 0000000..ebe6835
--- /dev/null
+++ b/audacity-no_return_in_nonvoid.patch
@@ -0,0 +1,12 @@
+Index: audacity-Audacity-2.2.0/src/widgets/NumericTextCtrl.cpp
+===================================================================
+--- audacity-Audacity-2.2.0.orig/src/widgets/NumericTextCtrl.cpp
++++ audacity-Audacity-2.2.0/src/widgets/NumericTextCtrl.cpp
+@@ -603,6 +603,7 @@ return theArray.Get();
+          case NumericConverter::BANDWIDTH:
+             return BandwidthConverterFormats();
+       }
++   return std::vector<BuiltinFormatString> {};
+    }
+ }
+ 
diff --git a/audacity.changes b/audacity.changes
index 99acdf4..a23293d 100644
--- a/audacity.changes
+++ b/audacity.changes
@@ -1,3 +1,54 @@
+-------------------------------------------------------------------
+Sun Nov  5 07:10:09 UTC 2017 - aloisio@gmx.com
+
+- Update to version 2.2.0
+  Improvements:
+  * Four Selectable themes provided, with new 'Light' theme as
+    default, plus option to customize
+  * Many menu changes:
+    + Menus Reorganized
+    + Extended menu bar provided
+    + New keyboard commands for working with clips
+  * Help buttons ? in Preferences, Effects, Generators and
+    Analyzers - and other places
+  * Non-Greying out of effects when no selection (and explanatory
+    dialog with help button)
+  * Playback of MIDI (and Allegro) files imported into Note Tracks
+    is now available.
+  * 'Center' option in Selection Toolbar
+  * Stem plots
+  * Major overhaul to documentation/manual including many new
+    images and streamlined text on landing pages for in-program
+    help.
+  Other Changes:
+  * Append-record is now the default (use Shift + Record for old
+    behavior, to record on a new track)
+  * The Esc key now cancels all click-and-drag actions. It also
+    chooses among overlapping mouse click targets, which is
+    especially useful in the Multi-Tool.
+  * Sync-Lock button removed (use menu item or keyboard shortcut
+    instead)
+  * New preferences and preference pages
+  * Overhaul of much code:
+    + Overhaul of envelope handling code to deal with some
+      anomalies
+    + Overhaul of exception handling for greater safety
+  * New Logo
+  Bug Fixes:
+  * Major work on bug fixing. 198 bugs that were in 2.1.3 fixed
+    for 2.2.0.
+    + The most serious bug fixed this time round was bug 437 which
+      was about what happens when Audacity is recording and runs
+      out of storage.
+    + The problems of incomplete support for macOs Sierra have
+      been resolved (including bug 290, bug 1567, bug 1702, and bug
+      1703).
+    + Most of the bugs fixed were more minor, such as bug 463
+      which was about a case in which the numbering on the timeline
+      could display incorrect times.
+
+- Added audacity-no_return_in_nonvoid.patch
+
 -------------------------------------------------------------------
 Fri Aug 25 15:16:21 UTC 2017 - davejplater@gmail.com
 
diff --git a/audacity.spec b/audacity.spec
index 229d0b2..5fa24e5 100644
--- a/audacity.spec
+++ b/audacity.spec
@@ -23,7 +23,7 @@
 %endif
 
 Name:           audacity
-Version:        2.1.3
+Version:        2.2.0
 Release:        0
 Summary:        A Free, Cross-Platform Digital Audio Editor
 License:        GPL-2.0+
@@ -39,6 +39,8 @@ Patch0:         %{name}-no_buildstamp.patch
 Patch1:         %{name}-flacversion.patch
 # PATCH-FIX-UPSTREAM audacity-fix-nonsense.patch sor.alexei@meowr.ru -- Remove things that break build for no reason.
 Patch2:         %{name}-fix-nonsense.patch
+# PATCH-FIX-UPSTREAM audacity-no_return_in_nonvoid.patch
+Patch3:         %{name}-no_return_in_nonvoid.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  cmake
@@ -104,6 +106,7 @@ than the physical memory size of your computer.
 %patch0
 %patch1 -p0
 %patch2 -p0
+%patch3 -p1
 
 cp -f %{SOURCE1} LICENSE_NYQUIST.txt
 # Make sure we use the system versions.