diff --git a/ChangeLog b/ChangeLog
index cb42b538e..74f42c0be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-18 Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/NSDistantObject.m: All code conditional on USE_FFCALL should
+	also be conditional on USE_LIBFFI so it works for both mechanisms.
+
 2004-01-14  Adam Fedor  <fedor@gnu.org>
 
 	* Source/Additions/GSObjCRuntime.m: Fix previous method def.
diff --git a/Source/NSDistantObject.m b/Source/NSDistantObject.m
index fdc1ab75c..1ccdd3073 100644
--- a/Source/NSDistantObject.m
+++ b/Source/NSDistantObject.m
@@ -700,7 +700,7 @@ enum
       else
 	{
 	  id		m = nil;
-#ifdef USE_FFCALL
+#if	defined(USE_FFCALL) || defined(USE_LIBFFI)
 	  id		inv;
 	  id		sig;
 
@@ -876,7 +876,7 @@ static inline BOOL class_is_kind_of (Class self, Class aClassObject)
 
 - (BOOL) conformsToProtocol: (Protocol*)aProtocol
 {
-#ifdef USE_FFCALL
+#if	defined(USE_FFCALL) || defined(USE_LIBFFI)
   BOOL m = NO;
   id inv, sig;
   DO_FORWARD_INVOCATION(conformsToProtocol:, aProtocol);
@@ -901,7 +901,7 @@ static inline BOOL class_is_kind_of (Class self, Class aClassObject)
 
 - (BOOL) respondsToSelector: (SEL)aSelector
 {
-#ifdef USE_FFCALL
+#if	defined(USE_FFCALL) || defined(USE_LIBFFI)
   BOOL m = NO;
   id inv, sig;
   DO_FORWARD_INVOCATION(respondsToSelector:, aSelector);