diff --git a/acc_disable-update-check.patch b/acc_disable-update-check.patch
index bfec766..d24e7f0 100644
--- a/acc_disable-update-check.patch
+++ b/acc_disable-update-check.patch
@@ -1,29 +1,10 @@
-diff -Nru azure-cli-core-2.16.0.orig/azure/cli/core/util.py azure-cli-core-2.16.0/azure/cli/core/util.py
---- azure-cli-core-2.16.0.orig/azure/cli/core/util.py	2020-12-04 13:30:56.000000000 +0100
-+++ azure-cli-core-2.16.0/azure/cli/core/util.py	2020-12-16 16:30:56.721229524 +0100
-@@ -419,39 +419,7 @@
+diff -Nru azure-cli-core-2.18.0.orig/azure/cli/core/util.py azure-cli-core-2.18.0/azure/cli/core/util.py
+--- azure-cli-core-2.18.0.orig/azure/cli/core/util.py	2021-01-15 10:50:35.000000000 +0100
++++ azure-cli-core-2.18.0/azure/cli/core/util.py	2021-01-21 10:32:01.708270048 +0100
+@@ -439,20 +439,7 @@
  
  
- def show_updates_available(new_line_before=False, new_line_after=False):
--    from azure.cli.core._session import VERSIONS
--    import datetime
--
--    if VERSIONS[_VERSION_CHECK_TIME]:
--        version_check_time = datetime.datetime.strptime(VERSIONS[_VERSION_CHECK_TIME], '%Y-%m-%d %H:%M:%S.%f')
--        if datetime.datetime.now() < version_check_time + datetime.timedelta(days=7):
--            return
--
--    _, updates_available_components = get_az_version_string(use_cache=True)
--    if updates_available_components:
--        if new_line_before:
--            logger.warning("")
--        show_updates(updates_available_components, only_show_when_updates_available=True)
--        if new_line_after:
--            logger.warning("")
--    VERSIONS[_VERSION_CHECK_TIME] = str(datetime.datetime.now())
--
--
--def show_updates(updates_available_components, only_show_when_updates_available=False):
+ def show_updates(updates_available_components, only_show_when_updates_available=False):
 -    if updates_available_components is None:
 -        if not only_show_when_updates_available:
 -            logger.warning('Unable to check if your CLI is up-to-date. Check your internet connection.')
diff --git a/azure-cli-core-2.17.1.tar.gz b/azure-cli-core-2.17.1.tar.gz
deleted file mode 100644
index c9ccf26..0000000
--- a/azure-cli-core-2.17.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:27cdbff8e535c48788e2bf37113f7ad213182f5c0b32ffa13d5c013d478b8651
-size 172598
diff --git a/azure-cli-core-2.18.0.tar.gz b/azure-cli-core-2.18.0.tar.gz
new file mode 100644
index 0000000..850ba51
--- /dev/null
+++ b/azure-cli-core-2.18.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2ab39c81672df2fc2efe9cafebe6bd8b3d26acbd8f0cef8444eb0621b202858c
+size 173069
diff --git a/azure-cli-core.changes b/azure-cli-core.changes
index f4d88f5..97df095 100644
--- a/azure-cli-core.changes
+++ b/azure-cli-core.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Thu Jan 21 15:11:04 UTC 2021 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
+
+- New upstream release
+  + Version 2.18.0
+  + For detailed information about changes see the
+    HISTORY.rst file provided with this package
+- Rework patch to disable automatic check for updates to
+  fix a crash when calling "az --version" (bsc#1180930)
+  + acc_disable-update-check.patch
+- Update Requires from setup.py
+
 -------------------------------------------------------------------
 Fri Jan  8 14:34:26 UTC 2021 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
 
diff --git a/azure-cli-core.spec b/azure-cli-core.spec
index f458b0e..4983c55 100644
--- a/azure-cli-core.spec
+++ b/azure-cli-core.spec
@@ -17,7 +17,7 @@
 
 
 Name:           azure-cli-core
-Version:        2.17.1
+Version:        2.18.0
 Release:        0
 Summary:        Microsoft Azure CLI Core Module
 License:        MIT
@@ -51,11 +51,11 @@ Requires:       python3-azure-common < 2.0
 Requires:       python3-azure-common >= 1.1
 Requires:       python3-azure-nspkg >= 3.0.0
 Requires:       python3-colorama >= 0.4.1
-Requires:       python3-humanfriendly < 9.0
+Requires:       python3-humanfriendly < 10.0
 Requires:       python3-humanfriendly >= 4.7
 Requires:       python3-jmespath
 Requires:       python3-knack < 1.0.0
-Requires:       python3-knack >= 0.7.2
+Requires:       python3-knack >= 0.8.0rc2
 Requires:       python3-msal < 2.0.0
 Requires:       python3-msal >= 1.0.0
 Requires:       python3-msal-extensions < 1.0.0