diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index 7ce9dfad..9343bd1d 100644
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-02  Marcus Brinkmann  <marcus@g10code.de>
+
+	* version.c: Include "assuan.h".
+	(do_subsystem_inits): Call assuan_set_assuan_err_source.
+
 2006-12-01  Marcus Brinkmann  <marcus@g10code.de>
 
 	* Makefile.am (libgpgme_real_la_SOURCES): Rename to main_sources.
diff --git a/gpgme/version.c b/gpgme/version.c
index 26d2dae2..2fec05d5 100644
--- a/gpgme/version.c
+++ b/gpgme/version.c
@@ -32,6 +32,8 @@
 /* For _gpgme_sema_subsystem_init ().  */
 #include "sema.h"
 
+#include "assuan.h"
+
 
 /* Bootstrap the subsystems needed for concurrent operation.  This
    must be done once at startup.  We can not guarantee this using a
@@ -48,6 +50,7 @@ do_subsystem_inits (void)
 
   _gpgme_sema_subsystem_init ();
   _gpgme_io_subsystem_init ();
+  assuan_set_assuan_err_source (GPG_ERR_SOURCE_GPGME);
 
   done = 1;
 }