diff --git a/kiwi-9.20.12.tar.gz b/kiwi-9.20.12.tar.gz
deleted file mode 100644
index 8066024e424fc6025ee96bd2243e88c0bff85ca9..0000000000000000000000000000000000000000
Binary files a/kiwi-9.20.12.tar.gz and /dev/null differ
diff --git a/kiwi-9.21.5.tar.gz b/kiwi-9.21.5.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..7e60638d3e0d3173ce05ae1010250bcc805f4ec6
Binary files /dev/null and b/kiwi-9.21.5.tar.gz differ
diff --git a/kiwi.spec b/kiwi.spec
index 8cb82324f08b5a2f69c2f7360287d90ddf7461f2..e59772ea8362d71e3616a30ce27bb204a27f4290 100644
--- a/kiwi.spec
+++ b/kiwi.spec
@@ -1,7 +1,7 @@
 %{?python_enable_dependency_generator}
 
 Name:           kiwi
-Version:        9.20.12
+Version:        9.21.5
 Release:        1
 License:        GPLv3+
 Summary:        Flexible operating system image builder
@@ -128,14 +128,13 @@ sed -e "s|#!/usr/bin/env python||" -i kiwi/xml_parse.py
 %set_build_flags
 
 %py3_build
+make CFLAGS="%{build_cflags}" tools
 
 %install
 %py3_install
+make buildroot=%{buildroot}/ install
 make buildroot=%{buildroot}/ install_dracut
 
-mkdir -p %{buildroot}%{_datadir}/bash-completion/completions
-mv %{buildroot}%{_sysconfdir}/bash_completion.d/kiwi-ng.sh %{buildroot}%{_datadir}/bash-completion/completions/kiwi-ng
-
 rm -rf %{buildroot}%{_sysconfdir}/bash_completion.d
 
 rm -rf %{buildroot}%{_docdir}/packages
@@ -170,7 +169,7 @@ done
 %files cli
 %defattr(-,root,root)
 %{_bindir}/%{name}*
-%{_datadir}/bash-completion/completions/%{name}-ng
+%{_datadir}/bash-completion/completions/%{name}-ng.sh
 %config(noreplace) %{_sysconfdir}/kiwi.yml
 
 %ifarch %{ix86} x86_64
@@ -190,6 +189,9 @@ done
 %{_mandir}/man8/%{name}*
 
 %changelog
+* Tue Jul 28 2020 xinghe <xinghe1@huawei.com> - 9.21.5-1
+- update version to 9.21.5
+
 * Sat Jun 20 2020 jixinjie <jixinjie@huawei.com> - 9.20.12-1
 - upgrade kiwi