diff --git a/download b/download
new file mode 100644
index 0000000000000000000000000000000000000000..b6902914551ec035139512128426dd8328b69003
--- /dev/null
+++ b/download
@@ -0,0 +1 @@
+2ea1db974bf501fe4f48865dce26ce52  tuna-0.17.tar.xz
diff --git a/tuna-0.16.tar.xz b/tuna-0.16.tar.xz
deleted file mode 100644
index 2cbb610f86c0e635311e37e9c77fba3a3e30193c..0000000000000000000000000000000000000000
Binary files a/tuna-0.16.tar.xz and /dev/null differ
diff --git a/tuna-Fix-ModuleNotFoundError.patch b/tuna-Fix-ModuleNotFoundError.patch
new file mode 100644
index 0000000000000000000000000000000000000000..7b5cc2052f2618c7b50865a07b129a42bffb980b
--- /dev/null
+++ b/tuna-Fix-ModuleNotFoundError.patch
@@ -0,0 +1,35 @@
+From 7684169d22af5379d2f466730c450afc92e80da8 Mon Sep 17 00:00:00 2001
+From: John Kacur <jkacur@redhat.com>
+Date: Tue, 11 Jan 2022 16:58:58 -0500
+Subject: [PATCH] tuna: Fix ModuleNotFoundError
+
+commit 43b434867514934593ada5aa8ea448ef6a1778f9 fixed the problem with
+relative imports but unfortunately created a new problem with installed
+tuna
+
+This fixes the original problem and also fixes the ModuleNotFoundError
+in an installed (not running from git) version of tuna.
+
+Signed-off-by: John Kacur <jkacur@redhat.com>
+---
+ tuna/tuna.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tuna/tuna.py b/tuna/tuna.py
+index 98a1725598dd..8fb42121e2e4 100755
+--- a/tuna/tuna.py
++++ b/tuna/tuna.py
+@@ -12,8 +12,8 @@ import platform
+ import ethtool
+ import procfs
+ from procfs import utilist
+-import help
+-import tuna_sched
++from tuna import help
++from tuna import tuna_sched
+ 
+ try:
+     fntable
+-- 
+2.27.0
+
diff --git a/tuna.spec b/tuna.spec
index 4d4c721b290ac09da34121c85c4839a1c52200d4..72b6bb60b1333e896c9be849663626c2be651cf8 100644
--- a/tuna.spec
+++ b/tuna.spec
@@ -1,7 +1,6 @@
-%define anolis_release .0.1
 Name: tuna
-Version: 0.16
-Release: 1%{anolis_release}%{?dist}
+Version: 0.17
+Release: 1%{?dist}
 License: GPLv2
 Summary: Application tuning GUI & command line utility
 Group: Applications/System
@@ -17,6 +16,7 @@ Requires: python3-linux-procfs >= 0.6
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 # PATCHES
+Patch1: tuna-Fix-ModuleNotFoundError.patch
 
 %description
 Provides interface for changing scheduler and IRQ tunables, at whole CPU and at
@@ -29,6 +29,7 @@ installed.
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 %{__python3} setup.py build
@@ -75,8 +76,27 @@ rm -rf %{buildroot}
 %{_datadir}/polkit-1/actions/org.tuna.policy
 
 %changelog
-* Thu Feb 24 2022 Weitao Zhou <zhouwt@linux.alibaba.com> - 0.16-1.0.1
-- Rebuild on platform-python
+* Thu Jan 13 2022 Leah Leshchinsky <lleshchi@redhat.com> - 0.17-1
+- Rebase to upstream version 0.17
+- Fix ModuleNotFoundError
+Resolves: rhbz#2012306
+
+* Tue Dec 14 2021 John Kacur <jkacur@redhat.com> - 0.16-5
+- Display correct cpu-affinity when a cpu is disabled
+Resolves: rhbz#2032614
+
+* Wed Nov 10 2021 John Kacur <jkacur@redhat.com> - 0.16-4
+- Make it clear in online help and man pages that --include and --isolate
+  affect IRQs as well as threads
+Resolves: rhbz#1886804
+
+* Thu Oct 28 2021 John Kacur <jkacur@redhat.com> - 0.16-3
+- Print warning if setaffinity causes EBUSY and continue
+Resolves: rhbz#2018285
+
+* Tue Oct 26 2021 Leah Leshchinsky <lleshchi@redhat.com> - 0.16-2
+- Add distinction between --spread and --move to error message
+Resolves: rhbz#2012241
 
 * Wed Jun 30 2021 John Kacur <jkacur@redhat.com> - 0.16-1
 - Upgrade to latest upstream