diff --git a/ChangeLog b/ChangeLog
index e97b47f78..433becf2b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2000-09-30  Mirko Viviani  <mirko.viviani@rccr.cremona.it>
+
+	* Source/NSDistantObject.m ([GSDistantObjectPlaceHolder
+	+respondsToSelector:]): implemented.
+	* Source/NSProcessInfo.m ([NSProcessInfo +load]): bug fix for FreeBSD.
+	* configure.in: enable_fake_main not enabled by default for FreeBSD-elf
+
 2000-09-30  Fred Kiefer <FredKiefer@gmx.de>
 
 	* Headers/gnustep/base/Unicode.h:
diff --git a/Source/NSDistantObject.m b/Source/NSDistantObject.m
index d978e28e0..5eff4481f 100644
--- a/Source/NSDistantObject.m
+++ b/Source/NSDistantObject.m
@@ -72,6 +72,7 @@ enum
 + (void) autorelease;
 + (void) release;
 + (id) retain;
++ (BOOL) respondsToSelector: (SEL)sel;
 @end
 
 @implementation	GSDistantObjectPlaceHolder
@@ -97,6 +98,11 @@ enum
     }
 }
 
++ (BOOL) respondsToSelector: (SEL)sel
+{
+  return (IMP)class_get_instance_method(self, sel) != (IMP)0;
+}
+
 + (id) initWithCoder: (NSCoder*)aCoder
 {
   gsu8			proxy_tag;
diff --git a/Source/NSProcessInfo.m b/Source/NSProcessInfo.m
index fd48c9318..d5068cb3d 100644
--- a/Source/NSProcessInfo.m
+++ b/Source/NSProcessInfo.m
@@ -152,7 +152,7 @@ static NSMutableSet	*_debug_set = nil;
  *** Implementing the gnustep_base_user_main function
  *************************************************************************/
 
-static void 
+void 
 _gnu_process_args(int argc, char *argv[], char *env[])
 {
   NSAutoreleasePool	*arp = [NSAutoreleasePool new];
@@ -330,7 +330,9 @@ static char	**_gnu_noobjc_env;
       else if (c == EOF)
 	break;
     }
+#ifndef __FreeBSD__
   _gnu_noobjc_argc++;
+#endif
   /*
    * Now _gnu_noobcj_argc is the number of arguments;
    * allocate memory accordingly.
diff --git a/configure b/configure
index dfa38b513..e1a8b1828 100755
--- a/configure
+++ b/configure
@@ -4293,6 +4293,7 @@ fi
 
 if test "$enable_pass_arguments" = "no"; then
   case "$target_os" in
+    freebsdelf*) ;;
     freebsd*)	enable_fake_main=yes;;
     netbsd*)	enable_fake_main=yes;;
     openbsd*)	enable_fake_main=yes;;
@@ -4331,17 +4332,17 @@ for ac_hdr in libxml/xmlversion.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4335: checking for $ac_hdr" >&5
+echo "configure:4336: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4340 "configure"
+#line 4341 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4345: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4346: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4374,7 +4375,7 @@ if test $ac_cv_header_libxml_xmlversion_h = no; then
   HAVE_LIBXML=0
 else
   cat > conftest.$ac_ext <<EOF
-#line 4378 "configure"
+#line 4379 "configure"
 #include "confdefs.h"
 #include "libxml/xmlversion.h"
     #if LIBXML_VERSION < 20000
@@ -4382,7 +4383,7 @@ else
     #endif
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4386: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4387: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
diff --git a/configure.in b/configure.in
index 8a5fd2c4d..71e6b903b 100644
--- a/configure.in
+++ b/configure.in
@@ -749,6 +749,7 @@ AC_ARG_ENABLE(fake-main,
 
 if test "$enable_pass_arguments" = "no"; then
   case "$target_os" in
+    freebsdelf*) ;;
     freebsd*)	enable_fake_main=yes;;
     netbsd*)	enable_fake_main=yes;;
     openbsd*)	enable_fake_main=yes;;