diff --git a/gettext-runtime-mini.changes b/gettext-runtime-mini.changes
index 45b81bd..0ae1f78 100644
--- a/gettext-runtime-mini.changes
+++ b/gettext-runtime-mini.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jun  3 09:41:40 UTC 2024 - Dan Čermák <dcermak@suse.com>
+
+- sync envsubst change with gettext-runtime-mini
+
 -------------------------------------------------------------------
 Tue May 21 10:25:25 UTC 2024 - Andreas Schwab <schwab@suse.de>
 
diff --git a/gettext-runtime-mini.spec b/gettext-runtime-mini.spec
index 7fbd14b..08b21ad 100644
--- a/gettext-runtime-mini.spec
+++ b/gettext-runtime-mini.spec
@@ -92,6 +92,8 @@ License:        LGPL-2.1-or-later
 Group:          Development/Tools/Other
 Requires:       %{name} = %{version}
 Requires:       xz
+# gettext.sh requires envsubst
+Requires:       envsubst = %{version}
 # autopoint requires find
 Requires:       findutils
 # For non-UTF encodings
@@ -139,6 +141,13 @@ BuildArch:      noarch
 This subpackage contains the HTML version of the gettext documentation
 as well as project examples.
 
+%package -n envsubst
+Summary:        Environment substitution helper binary
+
+%description -n envsubst
+This package contains the envsubst helper binary to replace values from the
+environment.
+
 %if %{without mini}
 %package     -n libtextstyle0
 Summary:        Provides textstyling for console output
@@ -278,7 +287,6 @@ make check || {
 %doc %dir %_docdir/%name/
 %doc %_docdir/%name/gettext.1.html
 %doc %_docdir/%name/ngettext.1.html
-%doc %_docdir/%name/envsubst.1.html
 %doc %_docdir/%name/*.3.html
 %doc %_docdir/%name/AUTHORS
 %doc %_docdir/%name/NEWS
@@ -286,7 +294,6 @@ make check || {
 %doc %_docdir/%name/FAQ.html
 %_bindir/gettext
 %_bindir/ngettext
-%_bindir/envsubst
 %_bindir/gettext.sh
 %_bindir/msgfmt
 %_libdir/libgettextlib-*.so
@@ -294,7 +301,6 @@ make check || {
 %_libdir/libasprintf.so.*
 %doc %_mandir/man1/gettext.1.gz
 %doc %_mandir/man1/ngettext.1.gz
-%doc %_mandir/man1/envsubst.1.gz
 %doc %_mandir/man1/msgfmt.1.gz
 %doc %_mandir/man3/*
 %_datadir/gettext/ABOUT-NLS
@@ -305,6 +311,12 @@ make check || {
 %_datadir/emacs/site-lisp/start-po.*
 %_datadir/emacs/site-lisp/suse-start-po-mode.el
 
+%files -n envsubst
+%license COPYING
+%_bindir/envsubst
+%doc %_mandir/man1/envsubst.1.gz
+%doc %_docdir/%name/envsubst.1.html
+
 %files -n gettext-tools%{?with_mini:-mini} -f gettext-tools.lang
 %defattr(-,root,root)
 %_bindir/msg[a-eg-u]*