diff --git a/.gitignore b/.gitignore
index c54ca79b..4416f7a1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -327,3 +327,4 @@
 /vim-8.2-1770.tar.bz2
 /vim-8.2-1805.tar.bz2
 /vim-8.2-1815.tar.bz2
+/vim-8.2-1885.tar.bz2
diff --git a/sources b/sources
index 90a1f2c5..fbf6eb81 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vim-8.2-1815.tar.bz2) = 7a5a5c25b51e7dc0208ca46158e4a44092ad318b68e13223e2a75db00d64cd766b8139063f8f10e7a40abfc5b0d11bde8529b9eafe298a8d9fea19ae303d15f5
+SHA512 (vim-8.2-1885.tar.bz2) = 76eb36b55c668b367056b3d4533e19246ee9af9fda527d5cf0fa5eef2e5661e4609e8f2a19fbceb444615ce266c0f90adea420a29248be87a9f4cd32c4593898
diff --git a/vim.csh b/vim.csh
index 3534be2c..3c956964 100644
--- a/vim.csh
+++ b/vim.csh
@@ -1,7 +1,7 @@
 # we need to use which twice - first for checking if
 # the command doesn't fail, the use it if doesn't fail
-set vim_cond = `which vim >& /dev/null && which vim`
-set vi_cond = `which vi >& /dev/null && which vi`
+set vim_cond = `command -v vim`
+set vi_cond = `command -v vi`
 
 switch ( $vim_cond-$vi_cond )
   case /usr/bin/vim-/usr/bin/vi:
diff --git a/vim.fish b/vim.fish
index 95949375..2c20e474 100644
--- a/vim.fish
+++ b/vim.fish
@@ -1,7 +1,7 @@
 # This will avoid user defined aliases and possibly stuff defined earlier in the PATH.
 # Redirecting is for the case when the binary is missing.
-set vim_cond (which vim 2> /dev/null)
-set vi_cond (which vi 2> /dev/null)
+set vim_cond (command -v vim)
+set vi_cond (command -v vi)
 
 switch "$vim_cond-$vi_cond"
   case /usr/bin/vim-/usr/bin/vi
diff --git a/vim.sh b/vim.sh
index 45a35be3..e257ad11 100644
--- a/vim.sh
+++ b/vim.sh
@@ -1,6 +1,6 @@
 if [ -n "${BASH_VERSION-}" -o -n "${KSH_VERSION-}" -o -n "${ZSH_VERSION-}" ]; then
   # This will avoid user defined aliases and possibly stuff defined earlier in the PATH.
-  case "$(which vim 2> /dev/null)-$(which vi 2> /dev/null)" in
+  case "$(command -v vim)-$(command -v vi)" in
     /usr/bin/vim-/usr/bin/vi)
         # apply only when founded vim and vi are in expected dirs from distro
         alias vi=vim
diff --git a/vim.spec b/vim.spec
index 5f4c5f25..80e303cc 100644
--- a/vim.spec
+++ b/vim.spec
@@ -1,4 +1,4 @@
-%define patchlevel 1815
+%define patchlevel 1885
 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
 %define WITH_SELINUX 1
 %endif
@@ -21,7 +21,7 @@ Summary: The VIM editor
 URL:     http://www.vim.org/
 Name: vim
 Version: %{baseversion}.%{patchlevel}
-Release: 2%{?dist}
+Release: 1%{?dist}
 License: Vim and MIT
 Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2
 Source1: vim.sh
@@ -129,8 +129,6 @@ Conflicts: %{name}-common < %{epoch}:8.1.1-1
 Conflicts: vim-enhanced < 2:8.2.1815-2
 Provides: vi
 Provides: %{_bindir}/vi
-# needed for profile script
-Requires: which
 
 %description minimal
 VIM (VIsual editor iMproved) is an updated and improved version of the
@@ -152,8 +150,6 @@ Provides: vim
 Provides: %{_bindir}/mergetool
 Provides: %{_bindir}/vim
 Requires: vim-common = %{epoch}:%{version}-%{release} which
-# needed for profile script
-Requires: which
 # suggest python3, python2, lua, ruby and perl packages because of their 
 # embedded functionality in Vim/GVim
 Suggests: python3 python3-libs
@@ -827,6 +823,12 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags
 %config(noreplace) %{_sysconfdir}/profile.d/vim-default-editor.*
 
 %changelog
+* Thu Oct 22 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.1885-1
+- patchlevel 1885
+
+* Mon Oct 19 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.1815-2
+- vim.sh, vim.csh, vim.fish - drop 'which', use 'command'
+
 * Thu Oct 15 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.1815-2
 - vim-default-editor.fish - dont give EDITOR universal scope
 - vim.sh, vim.csh - set aliases only for OS default vi and vim