diff --git a/coreutils-ln-avoid-segfault-for-empty-target.patch b/coreutils-ln-avoid-segfault-for-empty-target.patch
index 2af5d15..e27e8a3 100644
--- a/coreutils-ln-avoid-segfault-for-empty-target.patch
+++ b/coreutils-ln-avoid-segfault-for-empty-target.patch
@@ -1,4 +1,4 @@
-Port upstream commit:
+Port upstream commit, to be removed with v8.23.
 
   http://git.sv.gnu.org/cgit/coreutils.git/commit/?id=0093ac8d57
 
diff --git a/coreutils-testsuite.spec b/coreutils-testsuite.spec
index f58278c..645b932 100644
--- a/coreutils-testsuite.spec
+++ b/coreutils-testsuite.spec
@@ -131,7 +131,8 @@ Patch303:       coreutils-tests-shorten-extreme-factor-tests.patch
 # tests: avoid test framework failure if the file system lacks ACL support 
 Patch304:       coreutils-test-avoid-FP-when-no-ACL-support.patch
 
-# Port upstream patch: ln: with -sr, don't segfault for a TARGET of ''
+# Port upstream patch, to be removed with v8.23:
+# ln: with -sr, don't segfault for a TARGET of ''
 Patch305:       coreutils-ln-avoid-segfault-for-empty-target.patch
 
 # ================================================
diff --git a/coreutils.spec b/coreutils.spec
index 6ccdedd..c71d19a 100644
--- a/coreutils.spec
+++ b/coreutils.spec
@@ -131,7 +131,8 @@ Patch303:       coreutils-tests-shorten-extreme-factor-tests.patch
 # tests: avoid test framework failure if the file system lacks ACL support 
 Patch304:       coreutils-test-avoid-FP-when-no-ACL-support.patch
 
-# Port upstream patch: ln: with -sr, don't segfault for a TARGET of ''
+# Port upstream patch, to be removed with v8.23:
+# ln: with -sr, don't segfault for a TARGET of ''
 Patch305:       coreutils-ln-avoid-segfault-for-empty-target.patch
 
 # ================================================