diff --git a/gnu/local.mk b/gnu/local.mk
index 66f904291b..9a70d73759 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -747,7 +747,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/clucene-contribs-lib.patch               \
   %D%/packages/patches/cube-nocheck.patch			\
   %D%/packages/patches/cursynth-wave-rand.patch			\
-  %D%/packages/patches/cvs-2017-12836.patch			\
+  %D%/packages/patches/cvs-CVE-2017-12836.patch		\
   %D%/packages/patches/dbus-helper-search-path.patch		\
   %D%/packages/patches/dbus-CVE-2019-12749.patch		\
   %D%/packages/patches/dealii-mpi-deprecations.patch		\
diff --git a/gnu/packages/patches/cvs-2017-12836.patch b/gnu/packages/patches/cvs-CVE-2017-12836.patch
similarity index 100%
rename from gnu/packages/patches/cvs-2017-12836.patch
rename to gnu/packages/patches/cvs-CVE-2017-12836.patch
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 8effe1d502..b1fd0195ce 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -1409,7 +1409,7 @@ machine.")
              (uri (string-append
                    "https://ftp.gnu.org/non-gnu/cvs/source/feature/"
                    version "/cvs-" version ".tar.bz2"))
-             (patches (search-patches "cvs-2017-12836.patch"))
+             (patches (search-patches "cvs-CVE-2017-12836.patch"))
              (sha256
               (base32
                "0pjir8cwn0087mxszzbsi1gyfc6373vif96cw4q3m1x6p49kd1bq"))))