diff --git a/python-vim-vint.changes b/python-vim-vint.changes
index 0df9c5f..defda7c 100644
--- a/python-vim-vint.changes
+++ b/python-vim-vint.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Sep 16 10:46:25 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
+
+- Updat eto 0.3.21:
+  * various bugfixes only
+- Drop upstream merged patch yaml5.patch
+
 -------------------------------------------------------------------
 Mon Mar 18 10:59:30 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
 
diff --git a/python-vim-vint.spec b/python-vim-vint.spec
index b154434..ae0075a 100644
--- a/python-vim-vint.spec
+++ b/python-vim-vint.spec
@@ -18,15 +18,14 @@
 
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-vim-vint
-Version:        0.3.19
+Version:        0.3.21
 Release:        0
 Summary:        Lint tool for Vim script Language
 License:        MIT
 Group:          Development/Languages/Python
-Url:            https://github.com/Kuniwak/vint
-Source:         https://github.com/Kuniwak/vint/archive/v0.3.19.tar.gz
+URL:            https://github.com/Kuniwak/vint
+Source:         https://github.com/Kuniwak/vint/archive/v%{version}.tar.gz
 Patch0:         test-sys-executable.patch
-Patch1:         yaml5.patch
 BuildRequires:  %{python_module PyYAML >= 3.11}
 BuildRequires:  %{python_module ansicolor >= 0.2.4}
 BuildRequires:  %{python_module chardet >= 2.3.0}
@@ -43,13 +42,12 @@ BuildRequires:  python2-mock >= 1.0.1
 Requires:       python-PyYAML >= 3.11
 Requires:       python-ansicolor >= 0.2.4
 Requires:       python-chardet >= 2.3.0
+BuildArch:      noarch
 %ifpython2
 Requires:       python-enum34 >= 1.0.4
 Requires:       python-pathlib >= 1.0.1
 Requires:       python-typing >= 3.6.2
 %endif
-BuildArch:      noarch
-
 %python_subpackages
 
 %description
@@ -58,7 +56,6 @@ A lint tool for the Vim script Language.
 %prep
 %setup -q -n vint-%{version}
 %patch0 -p1
-%patch1 -p1
 sed -e 's/==/>=/g' \
     -e 's/\~=/>=/g' \
     -i setup.py \
diff --git a/v0.3.19.tar.gz b/v0.3.19.tar.gz
deleted file mode 100644
index a876c2b..0000000
--- a/v0.3.19.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:907adebee15039d6e0ca991c56987c35a647454c9f9a6168979007605d033ca0
-size 96755
diff --git a/v0.3.21.tar.gz b/v0.3.21.tar.gz
new file mode 100644
index 0000000..b89a2fe
--- /dev/null
+++ b/v0.3.21.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ebbb4ffd790324331aabf82d0b8777db8ce41d72d7c4c1c328bc099359ae06d6
+size 96747
diff --git a/yaml5.patch b/yaml5.patch
deleted file mode 100644
index 1be4717..0000000
--- a/yaml5.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 219b733e1be2beb2f714088d3916fdb065f9abdc Mon Sep 17 00:00:00 2001
-From: Daniel Hahler <github@thequod.de>
-Date: Tue, 29 Jan 2019 10:50:03 +0100
-Subject: [PATCH] Use yaml.safe_load (#298)
-
-Ref: https://github.com/Kuniwak/vint/issues/279#issuecomment-458106093
----
- vint/linting/config/config_file_source.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/vint/linting/config/config_file_source.py b/vint/linting/config/config_file_source.py
-index 210932c8..989e123a 100644
---- a/vint/linting/config/config_file_source.py
-+++ b/vint/linting/config/config_file_source.py
-@@ -13,7 +13,8 @@ def __init__(self, env):
-         config_file_path = self.get_file_path(env)
- 
-         with config_file_path.open() as file_obj:
--            self._config_dict = self.convert_config_dict(yaml.load(file_obj))
-+            config_yaml = yaml.safe_load(file_obj)
-+            self._config_dict = self.convert_config_dict(config_yaml)
- 
- 
-     def convert_config_dict(self, yaml_dict):