diff --git a/vim.spec b/vim.spec
index 7c0e9fd..a650e5e 100644
--- a/vim.spec
+++ b/vim.spec
@@ -29,7 +29,7 @@ Summary: The VIM editor
 URL:     http://www.vim.org/
 Name: vim
 Version: %{baseversion}.%{patchlevel}
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 2
 License: Vim and MIT
 Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2
@@ -134,9 +134,11 @@ multiple windows, multi-level undo, block highlighting and more.
 %package common
 Summary: The common files needed by any version of the VIM editor
 # conflicts in package because of manpage move (bug #1599663)
-# conflicts because of defaults.vim (bug #1969936)
-# remove after RHEL 8+2 is released
-Conflicts: %{name}-minimal < %{epoch}:8.2.2956-2
+# conflicts because of defaults.vim (bug #2026651)
+# remove after F36 EOL
+Conflicts: %{name}-minimal < %{epoch}:8.2.3642-2
+# shared files between common and minimal
+Requires: %{name}-data = %{epoch}:%{version}-%{release}
 Requires: %{name}-filesystem
 
 %description common
@@ -161,14 +163,16 @@ many different languages.
 %package minimal
 Summary: A minimal version of the VIM editor
 # conflicts in package because of manpage move (bug #1599663)
-# conflicts because of defaults.vim (bug #1969936)
-# remove after RHEL 8+2 is released
-Conflicts: %{name}-common < %{epoch}:8.2.2956-2
+# conflicts because of defaults.vim (bug #2026651)
+# remove after F36 EOL
+Conflicts: %{name}-common < %{epoch}:8.2.3642-2
 # remove Conflicts+Obsoletes for wrappers after F34 is EOL
 Conflicts: vim-wrappers < 2:8.2.2488-1
 Obsoletes: vim-wrappers < 2:8.2.2488-1
 Provides: vi
 Provides: %{_bindir}/vi
+# shared files between common and minimal
+Requires: %{name}-data = %{epoch}:%{version}-%{release}
 
 %description minimal
 VIM (VIsual editor iMproved) is an updated and improved version of the
@@ -286,6 +290,19 @@ Install the vim-X11 package if you'd like to try out a version of vi
 with graphics and mouse capabilities.  You'll also need to install the
 vim-common package.
 
+%package data
+Summary: Shared data for Vi and Vim
+BuildArch: noarch
+# moved files from filesystem, common and minimal to data
+# remove after F36 EOL
+Conflicts: %{name}-common < 2:8.2.3642-2
+Conflicts: %{name}-filesystem < 2:8.2.3642-2
+Conflicts: %{name}-minimal < 2:8.2.3642-2
+
+%description data
+The subpackage is used for shipping files and directories, which need to be
+shared between vim-minimal and vim-common packages.
+
 %if %{with default_editor}
 %package default-editor
 Summary: Set vim as the default editor
@@ -674,18 +691,15 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags
 %files common
 %config(noreplace) %{_sysconfdir}/vimrc
 %{!?_licensedir:%global license %%doc}
-%license LICENSE
 %doc README*
 %doc runtime/docs
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/vimfiles/template.spec
-%dir %{_datadir}/%{name}/%{vimdir}
 %{_datadir}/%{name}/%{vimdir}/autoload
 %{_datadir}/%{name}/%{vimdir}/colors
 %{_datadir}/%{name}/%{vimdir}/compiler
 %{_datadir}/%{name}/%{vimdir}/pack
 %{_datadir}/%{name}/%{vimdir}/doc
 %{_datadir}/%{name}/%{vimdir}/*.vim
+%exclude %{_datadir}/%{name}/%{vimdir}/defaults.vim
 %{_datadir}/%{name}/%{vimdir}/ftplugin
 %{_datadir}/%{name}/%{vimdir}/indent
 %{_datadir}/%{name}/%{vimdir}/keymap
@@ -825,7 +839,6 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags
 %{_bindir}/rview
 %{_bindir}/vi
 %{_bindir}/view
-%{_datadir}/%{name}/%{vimdir}/defaults.vim
 %{_libexecdir}/vi
 %{_mandir}/man1/vi.*
 %{_mandir}/man1/ex.*
@@ -842,7 +855,6 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags
 
 %files filesystem
 %{_rpmconfigdir}/macros.d/macros.vim
-%dir %{_datadir}/%{name}/vimfiles
 %dir %{_datadir}/%{name}/vimfiles/after
 %dir %{_datadir}/%{name}/vimfiles/after/*
 %dir %{_datadir}/%{name}/vimfiles/autoload
@@ -887,6 +899,14 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags
 %dir %{_datadir}/icons/locolor/*/apps
 %{_datadir}/icons/locolor/*/apps/*
 
+%files data
+%license LICENSE
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/%{vimdir}
+%{_datadir}/%{name}/%{vimdir}/defaults.vim
+%dir %{_datadir}/%{name}/vimfiles
+%{_datadir}/%{name}/vimfiles/template.spec
+
 %if %{with default_editor}
 %files default-editor
 %dir %{_datadir}/fish/vendor_conf.d
@@ -896,6 +916,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags
 %endif
 
 %changelog
+* Thu Nov 25 2021 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.3642-2
+- 2026651 - defaults.vim changes create conflicts between vim-minimal and vim-common
+
 * Mon Nov 22 2021 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.3642-1
 - patchlevel 3642