--- swank-sbcl.lisp.~1.275.~	2010-08-26 00:39:44.000000000 +0400
+++ swank-sbcl.lisp	2010-08-26 00:51:10.000000000 +0400
@@ -867,12 +867,14 @@
                  (definition-source-for-emacs defsrc 'function name)))))
 
 (defimplementation list-callers (symbol)
-  (let ((fn (fdefinition symbol)))
-    (sanitize-xrefs
-     (mapcar #'function-dspec (sb-introspect:find-function-callers fn)))))
+  (if (macro-function symbol)
+      (who-macroexpands symbol)
+      (let ((fn (fdefinition symbol)))
+        (sanitize-xrefs
+         (mapcar #'function-dspec (sb-introspect:find-function-callers fn))))))
 
 (defimplementation list-callees (symbol)
-  (let ((fn (fdefinition symbol)))
+  (let ((fn (or (macro-function symbol) (fdefinition symbol))))
     (sanitize-xrefs
      (mapcar #'function-dspec (sb-introspect:find-function-callees fn)))))