diff --git a/ChangeLog b/ChangeLog
index f73c93b02..297f98cfc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-10-05  Werner Koch  <wk@g10code.com>
+
+	* configure.ac: Changed identification file name to g10/gpg.c
+
 2005-10-02  Marcus Brinkmann  <marcus@g10code.de>
 
 	* configure.ac [!$try_gettext]: Invoke AM_PO_SUBDIRS.
diff --git a/configure.ac b/configure.ac
index 17482d4c0..484c1a913 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,7 +33,7 @@ AC_INIT(gnupg, 1.4.3-cvs, bug-gnupg@gnu.org)
 development_version=no
 
 AC_CONFIG_AUX_DIR(scripts)
-AC_CONFIG_SRCDIR(g10/g10.c)
+AC_CONFIG_SRCDIR(g10/gpg.c)
 AC_CANONICAL_HOST
 AM_INIT_AUTOMAKE([std-options])
 AM_CONFIG_HEADER(config.h)
diff --git a/g10/Makefile.am b/g10/Makefile.am
index fd3789724..0fc40dd55 100644
--- a/g10/Makefile.am
+++ b/g10/Makefile.am
@@ -70,7 +70,7 @@ common_source =  \
 	      signal.c
 
 if ENABLE_CARD_SUPPORT
-card_support_source_g10 = card-util.c 
+card_support_source_gpg = card-util.c 
 card_support_source_scd = \
 	app-common.h \
 	app-openpgp.c \
@@ -79,14 +79,14 @@ card_support_source_scd = \
 	ccid-driver.c ccid-driver.h
 card_support_source_local = cardglue.c cardglue.h tlv.c tlv.h
 else
-card_support_source_g10 =
+card_support_source_gpg =
 card_support_source_scd = 
 card_support_source_local =
 endif
 
-card_support_source = $(card_support_source_local) $(card_support_source_g10) $(card_support_source_scd)
+card_support_source = $(card_support_source_local) $(card_support_source_gpg) $(card_support_source_scd)
 
-gpg_SOURCES  = g10.c		\
+gpg_SOURCES  = gpg.c		\
 	      $(common_source)	\
 	      $(card_support_source) \
 	      pkclist.c 	\
@@ -148,7 +148,7 @@ update-source-from-gnupg-2:
 	 for i in $(card_support_source_scd); do \
            cp $$dir/scd/$$i $$i; echo $$i; \
 	 done ;\
-	 for i in $(card_support_source_g10); do \
+	 for i in $(card_support_source_gpg); do \
            cp $$dir/g10/$$i $$i; echo $$i; \
 	 done ; \
 	 echo "Please remember to update the ChangeLog accordingly!"