diff --git a/src/ChangeLog b/src/ChangeLog
index cb6dbd32..95dc804c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-19  Werner Koch  <wk@g10code.com>
+
+	* rungpg.c: Rename to engine-gpg.c
+	* Makefile.am (main_sources): Ditto.
+
 2008-12-03  Marcus Brinkmann  <marcus@g10code.de>
 
 	* Makefile.am (status-table.h): Use $(builddir) to find gpgme.h.
@@ -5893,7 +5898,7 @@
 	* data.c (gpgme_data_rewind): Allow to rewind data_type_none.
 
 
- Copyright 2001,2002,2003,2004,2005,2006,2007 g10 Code GmbH
+ Copyright 2001,2002,2003,2004,2005,2006,2007,2008,2009 g10 Code GmbH
 
  This file is free software; as a special exception the author gives
  unlimited permission to copy and/or distribute it, with or without
diff --git a/src/Makefile.am b/src/Makefile.am
index 603f606a..5a7ca59b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -105,7 +105,7 @@ main_sources =								\
 	sign.c passphrase.c progress.c					\
 	key.c keylist.c trust-item.c trustlist.c			\
 	import.c export.c genkey.c delete.c edit.c getauditlog.c        \
-	engine.h engine-backend.h engine.c rungpg.c status-table.h	\
+	engine.h engine-backend.h engine.c engine-gpg.c status-table.h	\
 	$(gpgsm_components) $(gpgconf_components) gpgconf.c		\
 	sema.h priv-io.h $(system_components)				\
 	debug.c debug.h gpgme.c version.c error.c
diff --git a/src/rungpg.c b/src/engine-gpg.c
similarity index 99%
rename from src/rungpg.c
rename to src/engine-gpg.c
index fc0da117..8be76000 100644
--- a/src/rungpg.c
+++ b/src/engine-gpg.c
@@ -1,6 +1,7 @@
-/* rungpg.c - Gpg Engine.
+/* engine-gpg.c - Gpg Engine.
    Copyright (C) 2000 Werner Koch (dd9jn)
-   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 g10 Code GmbH
+   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+                 2009 g10 Code GmbH
  
    This file is part of GPGME.
  
@@ -15,9 +16,8 @@
    Lesser General Public License for more details.
    
    You should have received a copy of the GNU Lesser General Public
-   License along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.  */
+   License along with this program; if not, see <http://www.gnu.org/licenses/>.
+*/
 
 #if HAVE_CONFIG_H
 #include <config.h>