diff --git a/gettext.spec b/gettext.spec
index 49ad3c4..ccad38c 100644
--- a/gettext.spec
+++ b/gettext.spec
@@ -5,7 +5,7 @@
 Summary: GNU tools and libraries for localized translated messages
 Name: gettext
 Version: 0.21
-Release: 17%{?dist}.0.%{snapshot}
+Release: 18%{?dist}.0.%{snapshot}
 
 # The following are licensed under LGPLv2+:
 # - libintl and its headers
@@ -99,6 +99,8 @@ Summary: GNU runtime libraries and programs for producing multi-lingual messages
 License: GPLv3+ and LGPLv2+
 # Depend on the exact version of the library sub package
 Requires: %{name}-libs%{_isa} = %{version}-%{release}
+Requires: %{name}-envsubst = %{version}-%{release}
+
 
 %description runtime
 The GNU gettext-runtime package provides an easy to use runtime libraries and
@@ -170,6 +172,13 @@ This program can be used to alter .po files in ways no sane mind would
 think about.
 
 
+%package envsubst
+Summary: Substitutes the values of environment variables
+
+%description envsubst
+Substitutes the values of environment variables.
+
+
 %prep
 %autosetup -S git
 # Refresh autotools files to latest versions
@@ -329,7 +338,6 @@ make check LIBUNISTRING=-lunistring
 %doc gettext-runtime/BUGS
 %doc gettext-runtime/man/*.1.html
 %doc gettext-runtime/intl/COPYING*
-%{_bindir}/envsubst
 %{_bindir}/gettext
 %{_bindir}/gettext.sh
 %{_bindir}/ngettext
@@ -351,6 +359,10 @@ make check LIBUNISTRING=-lunistring
 %dir %{_datadir}/%{name}-%{version}
 %{_datadir}/%{name}-%{version}/its
 
+%files envsubst
+%license COPYING
+%{_bindir}/envsubst
+
 %files common-devel
 %{_datadir}/%{name}/archive.*.tar.xz
 
@@ -401,6 +413,10 @@ make check LIBUNISTRING=-lunistring
 %{_mandir}/man1/msghack.1*
 
 %changelog
+* Wed Aug 10 2022 Honza Horak <hhorak@redhat.com> - 0.21-18.0.20220203
+- Introduce envsubst sub-package for allow install envsubst with minimal
+  footprint
+
 * Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.21-17.0.20220203
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild