diff --git a/efgrep-warning.patch b/efgrep-warning.patch
new file mode 100644
index 0000000..6782a69
--- /dev/null
+++ b/efgrep-warning.patch
@@ -0,0 +1,9 @@
+Index: grep-3.8/src/egrep.sh
+===================================================================
+--- grep-3.8.orig/src/egrep.sh
++++ grep-3.8/src/egrep.sh
+@@ -1,4 +1,2 @@
+ #!@SHELL@
+-cmd=${0##*/}
+-echo "$cmd: warning: $cmd is obsolescent; using @grep@ @option@" >&2
+ exec @grep@ @option@ "$@"
diff --git a/grep.changes b/grep.changes
index 524c2b0..7fb37f6 100644
--- a/grep.changes
+++ b/grep.changes
@@ -1,18 +1,11 @@
 -------------------------------------------------------------------
-Sun Mar  5 20:55:49 UTC 2023 - Andreas Stieger <andreas.stieger@gmx.de>
+Mon Mar  6 09:28:35 UTC 2023 - Andreas Schwab <schwab@suse.de>
 
-- GNU grep 3.9:
+- Update to grep 3.9
   * With -P, some non-ASCII UTF8 characters were not recognized as
     word-constituent due to our omission of the PCRE2_UCP flag.
-    E.g., given f(){ echo Perú|LC_ALL=en_US.UTF-8 grep -Po "$1"; }
-    and this command, echo $(f 'r\w'):$(f '.\b'), before it would
-    print ":r". After the fix, it prints the correct results: "rú:ú".
-  * When given multiple patterns the last of which has a back-
-    reference, grep no longer sometimes mistakenly matches lines in
-    some cases.
-- The long obsolete egrep and fgrep commands again issue a friendly
-  message asking for users to convert to grep -E and grep -F. All
-  openSUSE package builds are fixed - drop efgrep-warning.patch
+  * When given multiple patterns the last of which has a back-reference,
+    grep no longer sometimes mistakenly matches lines in some cases
 
 -------------------------------------------------------------------
 Tue Dec 27 12:25:45 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
diff --git a/grep.spec b/grep.spec
index 84b3167..055570d 100644
--- a/grep.spec
+++ b/grep.spec
@@ -29,10 +29,10 @@ Source2:        https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz.sig
 Source3:        %{name}.keyring
 Source4:        profile.sh
 Source5:        %{name}-rpmlintrc
+Patch0:         efgrep-warning.patch
 BuildRequires:  fdupes
 BuildRequires:  glibc-locale
 BuildRequires:  makeinfo
-BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(libpcre2-8)
 Provides:       base:%{_bindir}/grep
 
@@ -65,7 +65,6 @@ echo exit 77 > tests/pcre-jitstack
 echo exit 77 > gnulib-tests/test-c-stack.sh
 echo 'int main() { return 77; }' > gnulib-tests/test-sigsegv-catch-stackoverflow1.c
 echo 'int main() { return 77; }' > gnulib-tests/test-sigsegv-catch-stackoverflow2.c
-echo 'int main() { return 77; }' > gnulib-tests/test-free.c
 %endif
 %make_build check