diff --git a/sblim-wbemcli-1.6.3-fix-cmx-crash.patch b/sblim-wbemcli-1.6.3-fix-cmx-crash.patch
new file mode 100644
index 0000000..01e19af
--- /dev/null
+++ b/sblim-wbemcli-1.6.3-fix-cmx-crash.patch
@@ -0,0 +1,11 @@
+diff -up sblim-wbemcli-1.6.3/main.cpp.orig sblim-wbemcli-1.6.3/main.cpp
+--- sblim-wbemcli-1.6.3/main.cpp.orig	2022-05-02 10:36:09.283825148 +0200
++++ sblim-wbemcli-1.6.3/main.cpp	2022-05-02 10:36:33.440858294 +0200
+@@ -286,6 +286,7 @@ int main (int argc, char *argv[]) {
+            op==GetProperty ||
+            op==SetProperty ||
+            op==CallMethod ||
++           op==CallMethodX ||
+            op==ModifyInstance) && !xtraStr)
+          throw CmdException("Invalid command invocation 2");
+ 
diff --git a/sblim-wbemcli.spec b/sblim-wbemcli.spec
index 4d969b5..936ef44 100644
--- a/sblim-wbemcli.spec
+++ b/sblim-wbemcli.spec
@@ -1,6 +1,6 @@
 Name:           sblim-wbemcli
 Version:        1.6.3
-Release:        21%{?dist}
+Release:        22%{?dist}
 Summary:        SBLIM WBEM Command Line Interface
 
 License:        EPL-1.0
@@ -11,6 +11,7 @@ Patch1:         sblim-wbemcli-1.6.2-https-segfaults.patch
 Patch2:         sblim-wbemcli-1.6.1-ssl-proto-option.patch
 Patch3:         sblim-wbemcli-1.6.3-fix-exit-status.patch
 Patch4:         sblim-wbemcli-1.6.3-covscan-fixes.patch
+Patch5:         sblim-wbemcli-1.6.3-fix-cmx-crash.patch
 
 BuildRequires: make
 BuildRequires:  curl-devel >= 7.9.3
@@ -32,6 +33,7 @@ autoreconf --install --force
 %patch2 -p1 -b .ssl-proto-option
 %patch3 -p1 -b .fix-exit-status
 %patch4 -p1 -b .covscan-fixes
+%patch5 -p1 -b .fix-cmx-crash
 
 %build
 %configure CACERT=/etc/pki/Pegasus/client.pem
@@ -48,6 +50,10 @@ mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}
 %{_datadir}/%{name}
 
 %changelog
+* Mon May 23 2022 Vitezslav Crhonek <vcrhonek@redhat.com> - 1.6.3-22
+- Fix crash when using "cmx" command with no additional parameter
+  Resolves: #2083577
+
 * Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1.6.3-21
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
   Related: rhbz#1991688