diff --git a/vim.spec b/vim.spec
index ff7cb69..cbd80a3 100644
--- a/vim.spec
+++ b/vim.spec
@@ -6,8 +6,8 @@
 %define        with_gvim   0
 
 Name:          vim
-Version:       8.2.2827
-Release:       1mamba
+Version:       8.2.2840
+Release:       2mamba
 Summary:       VIsual editor iMproved
 Group:         Applications/Text
 Vendor:        openmamba
@@ -25,7 +25,8 @@ BuildRequires: libncurses-devel
 BuildRequires: libperl
 BuildRequires: libruby-devel
 BuildRequires: libselinux-devel
-BuildRequires: libtcl
+BuildRequires: libtcl-devel
+BuildRequires: perl-devel
 ## AUTOBUILDREQ-END
 BuildRequires: gettext-devel
 
@@ -59,21 +60,12 @@ VIM improves on vi by adding new features: multiple windows, multi-level undo, b
 If you install this package, you can run VIM as an X application with a full GUI interface and mouse support.
 This package provides tutorial files.
 
+%debug_package
+
 %prep
 %setup -q
-
-%define _use_internal_dependency_generator 0
-
-# Find requires modified
-%define __find_requires %{_builddir}/%{name}-%{version}/find_requires.sh
-
-# Find requires will ignore datadir files to avoid a wrong /bin/csh requirement
-cat > find_requires.sh << _EOF
-#! /bin/sh
-grep -v %{_datadir} | %{_prefix}/lib/rpm/find-requires %{buildroot} %{_target_cpu} 
-_EOF
-
-chmod +x find_requires.sh
+# Avoid an unwanted /bin/csh requirement
+%define __requires_exclude_from ^%{_datadir}/.*$
 
 sed -i '
    s,SYS_VIMRC_FILE "\$VIM/vimrc",SYS_VIMRC_FILE "%{_sysconfdir}/vim/vimrc",
@@ -129,6 +121,7 @@ mv src/vim src/gvim
    --enable-pythoninterp \
    --enable-tclinterp \
    --enable-rubyinterp \
+   --with-tclsh=%{_bindir}/tclsh \
    --enable-cscope \
    --disable-acl \
    --enable-multibyte
@@ -142,7 +135,7 @@ mv src/vim src/gvim
 
 %install
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
-%makeinstall
+%makeinstall STRIP=/bin/true
 
 ln -s vim %{buildroot}%{_bindir}/vi
 install -m 0644 -D %{S:2} %{buildroot}%{_sysconfdir}/skel/.vimrc
@@ -184,6 +177,21 @@ install -m 0755 -D src/gvim %{buildroot}%{_bindir}/gvim
 %{_datadir}/vim/%{vimdir}/tutor
 
 %changelog
+* Fri May 07 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 8.2.2840-2mamba
+- fix building with latest libtcl; added debug package
+
+* Fri May 07 2021 Automatic Build System <autodist@mambasoft.it> 8.2.2840-1mamba
+- automatic version update by autodist
+
+* Fri May 07 2021 Automatic Build System <autodist@mambasoft.it> 8.2.2836-1mamba
+- automatic version update by autodist
+
+* Wed May 05 2021 Automatic Build System <autodist@mambasoft.it> 8.2.2832-1mamba
+- automatic version update by autodist
+
+* Tue May 04 2021 Automatic Build System <autodist@mambasoft.it> 8.2.2831-1mamba
+- automatic version update by autodist
+
 * Tue May 04 2021 Automatic Build System <autodist@mambasoft.it> 8.2.2827-1mamba
 - automatic version update by autodist