diff --git a/ChangeLog b/ChangeLog
index 9a0294d5..74ea1e11 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-06-19  Anders Carlsson  <andersca@codefactory.se>
+
+	* glib/dbus-glib.h: Fix so that dbus-glib.h can be used
+	from C++ (Patch by Miloslav Trmac).
+
 2003-06-15  Joe Shaw  <joe@assbarn.com>
 
 	* configure.in: Check for socklen_t.
diff --git a/glib/dbus-glib.h b/glib/dbus-glib.h
index f92d729e..c6116c52 100644
--- a/glib/dbus-glib.h
+++ b/glib/dbus-glib.h
@@ -26,10 +26,14 @@
 #include <dbus/dbus.h>
 #include <glib.h>
 
+G_BEGIN_DECLS
+
 void dbus_gthread_init                 (void);
 void dbus_connection_setup_with_g_main (DBusConnection *connection,
 					GMainContext   *context);
 void dbus_server_setup_with_g_main     (DBusServer     *server,
 					GMainContext   *context);
 
+G_END_DECLS
+
 #endif /* DBUS_GLIB_H */