diff --git a/README b/README
index d81437a..891441a 100644
--- a/README
+++ b/README
@@ -1,29 +1,28 @@
 Package %{scl_name} is the main package for Red Hat GCC
 Toolset 16.  By installing the %{scl_name} package, you will get
 the working set of packages that are included in Red Hat GCC
-Toolset 16, which includes development and debugging tools.
+Toolset 16, which includes the compiler and linker.
 
-Usage: scl enable %{scl} <command>
+Usage: %{scl_name}-env [command]
 
 Red Hat GCC Toolset allows you to build and execute applications
 which are not located in the filesystem root hierarchy, but are
 stored in an alternative location, which is %{_scl_root} in case
-of the %{scl_name} collection.
+of %{scl_name}.
 
 Examples:
-scl enable %{scl_name} 'command --arg'
+%{scl_name}-env
+  Run an interactive shell wherein %{scl_name} is enabled.
+
+%{scl_name}-env command --arg
   Run a specific command with the argument --arg within the %{scl_name}
   Red Hat GCC Toolset environment.
 
-scl enable %{scl_name} 'gcc'
+%{scl_name}-env gcc
   Run GCC from the %{scl_name} Red Hat GCC Toolset.
 
-scl enable %{scl_name} 'bash'
-  Run an interactive shell wherein the %{scl_name} software collection
-  is enabled.
-
-scl enable %{scl_name} 'man gcc'
+%{scl_name}-env man gcc
   Show man pages for the gcc command, which is a part of the
   %{scl_name} Red Hat GCC Toolset.
 
-Report bugs to <https://issues.redhat.com>.
+Report bugs to <%{dist_bug_report_url}>.
diff --git a/gcc-toolset-16.spec b/gcc-toolset-16.spec
index e8d8534..2172bc7 100644
--- a/gcc-toolset-16.spec
+++ b/gcc-toolset-16.spec
@@ -37,7 +37,7 @@ BuildRequires: scl-utils-build
 Summary: Package that installs %scl
 Name: %scl_name
 Version: %{gts_ver}.0
-Release: 0%{?dist}
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/File
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -265,5 +265,9 @@ fi
 %endif
 
 %changelog
+* Mon Aug 10 2026 Marek Polacek <polacek@redhat.com> - 16.0-1
+- update README (RHEL-222375)
+- update gcc-toolset-env.in (RHEL-222373)
+
 * Tue May 26 2026 Marek Polacek <polacek@redhat.com> - 16.0-0
 - new package (RHEL-160026)
diff --git a/gcc-toolset-env.in b/gcc-toolset-env.in
index 7a96adb..0e129fa 100644
--- a/gcc-toolset-env.in
+++ b/gcc-toolset-env.in
@@ -1,11 +1,14 @@
+#!/usr/bin/sh
 # Environment wrapper for GCC Toolset %{gts_ver}
 
-source %{_root_prefix}/lib/gcc-toolset/%{gts_ver}-env.source
+. %{_root_prefix}/lib/gcc-toolset/%{gts_ver}-env.source
 
-if [ -z $1 ]; then
-  cmd="/bin/sh"
+if [ -z "$1" ]; then
+  exec /usr/bin/sh
+# Compatibility with `scl enable`, where the entire command shows up as a
+# single argument.
+elif [ -z "$2" ]; then
+  exec sh -c "$@"
 else
-  cmd=$*
+  exec "$@"
 fi
-
-exec $cmd