diff --git a/g10/Makefile.am b/g10/Makefile.am
index cba65b22a..b8b92d702 100644
--- a/g10/Makefile.am
+++ b/g10/Makefile.am
@@ -131,7 +131,7 @@ gpg_sources = server.c          \
 	      passphrase.c	\
 	      decrypt.c 	\
 	      decrypt-data.c	\
-	      cipher.c		\
+	      cipher-cfb.c	\
 	      cipher-aead.c     \
 	      encrypt.c		\
 	      sign.c		\
diff --git a/g10/cipher.c b/g10/cipher-cfb.c
similarity index 98%
rename from g10/cipher.c
rename to g10/cipher-cfb.c
index ad7399dec..79b21bd8a 100644
--- a/g10/cipher.c
+++ b/g10/cipher-cfb.c
@@ -1,4 +1,4 @@
-/* cipher.c - Enciphering filter for the old CFB mode.
+/* cipher-cfb.c - Enciphering filter for the old CFB mode.
  * Copyright (C) 1998-2003, 2006, 2009 Free Software Foundation, Inc.
  * Copyright (C) 1998-2003, 2006, 2009, 2017 Werner koch
  *