diff --git a/ChangeLog b/ChangeLog
index 8f40bc22..ee86d051 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-15  Robert McQueen  <robot101@debian.org>
+
+	* python/service.py: Include the traceback in the error reply when we
+	send an exception over the bus. _BEST_ _PATCH_ _EVER_
+
 2005-11-14  David Zeuthen  <davidz@redhat.com>
 
 	Patch from Timo Hoenig <thoenig@suse.de>.
diff --git a/python/service.py b/python/service.py
index 409fc78a..6c3561ad 100644
--- a/python/service.py
+++ b/python/service.py
@@ -2,6 +2,8 @@
 import dbus_bindings 
 import _dbus
 import operator
+import traceback
+
 from exceptions import UnknownMethodException
 from decorators import method
 from decorators import signal
@@ -170,7 +172,7 @@ def _method_reply_error(connection, message, exception):
     else:
         name = 'org.freedesktop.DBus.Python.%s.%s' % (exception.__module__, exception.__class__.__name__)
 
-    contents = str(exception)
+    contents = traceback.format_exc()
     reply = dbus_bindings.Error(message, name, contents)
 
     connection.send(reply)