diff --git a/ChangeLog b/ChangeLog
index 0d922f9f1..c9c7ac9f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,7 @@
  - (bal) Revered out of runtime IRIX detection of joblimits.  Code is
    incomplete.
  - (bal) Quiet down configure.ac if /bin/test does not exist.
+ - (bal) We no longer use atexit()/xatexit()/on_exit()
 
 20020405
  - (bal) Patch for OpenSC SmartCard library; ok markus@; patch by
@@ -8186,4 +8187,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.2032 2002/04/06 20:30:07 mouring Exp $
+$Id: ChangeLog,v 1.2033 2002/04/06 23:52:02 mouring Exp $
diff --git a/acconfig.h b/acconfig.h
index c7003fe55..00fdfac63 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -1,4 +1,4 @@
-/* $Id: acconfig.h,v 1.126 2002/04/05 20:23:37 mouring Exp $ */
+/* $Id: acconfig.h,v 1.127 2002/04/06 23:52:04 mouring Exp $ */
 
 #ifndef _CONFIG_H
 #define _CONFIG_H
@@ -283,9 +283,6 @@
 /* Use IPv4 for connection by default, IPv6 can still if explicity asked */
 #undef IPV4_DEFAULT
 
-/* If you have no atexit() but xatexit(), and want to use xatexit() */
-#undef HAVE_XATEXIT
-
 /* getaddrinfo is broken (if present) */
 #undef BROKEN_GETADDRINFO
 
diff --git a/configure.ac b/configure.ac
index a9dea2eec..abe9a1a42 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.34 2002/04/06 20:30:09 mouring Exp $
+# $Id: configure.ac,v 1.35 2002/04/06 23:52:04 mouring Exp $
 
 AC_INIT
 AC_CONFIG_SRCDIR([ssh.c])
@@ -127,9 +127,6 @@ case "$host" in
 mips-sony-bsd|mips-sony-newsos4)
 	AC_DEFINE(HAVE_NEWS4)
 	SONY=1
-	AC_CHECK_LIB(iberty, xatexit, AC_DEFINE(HAVE_XATEXIT),
-		AC_MSG_ERROR([*** libiberty missing - please install first or check config.log ***])
-        )
 	;;
 *-*-netbsd*)
 	need_dash_r=1
@@ -532,12 +529,12 @@ AC_ARG_WITH(tcp-wrappers,
 )
 
 dnl    Checks for library functions.
-AC_CHECK_FUNCS(arc4random atexit b64_ntop bcopy bindresvport_sa \
+AC_CHECK_FUNCS(arc4random b64_ntop bcopy bindresvport_sa \
 	clock fchmod fchown freeaddrinfo futimes gai_strerror \
 	getaddrinfo getcwd getgrouplist getnameinfo getopt \
 	getrlimit getrusage getttyent glob inet_aton inet_ntoa \
 	inet_ntop innetgr login_getcapbool md5_crypt memmove \
-	mkdtemp on_exit openpty readpassphrase realpath \
+	mkdtemp openpty readpassphrase realpath \
 	rresvport_af setdtablesize setegid setenv seteuid \
 	setlogin setproctitle setresgid setreuid setrlimit \
 	setsid setvbuf sigaction sigvec snprintf strerror \
diff --git a/defines.h b/defines.h
index ec0d8e587..d6a6a1470 100644
--- a/defines.h
+++ b/defines.h
@@ -1,7 +1,7 @@
 #ifndef _DEFINES_H
 #define _DEFINES_H
 
-/* $Id: defines.h,v 1.84 2002/03/22 21:08:04 stevesk Exp $ */
+/* $Id: defines.h,v 1.85 2002/04/06 23:52:05 mouring Exp $ */
 
 /* Necessary headers */
 
@@ -493,14 +493,6 @@ struct winsize {
 # define memmove(s1, s2, n) bcopy((s2), (s1), (n))
 #endif /* !defined(HAVE_MEMMOVE) && defined(HAVE_BCOPY) */
 
-#if !defined(HAVE_ATEXIT) && defined(HAVE_ON_EXIT)
-# define atexit(a) on_exit(a, NULL)
-#else
-# if defined(HAVE_XATEXIT)
-#  define atexit(a) xatexit(a)
-# endif /* defined(HAVE_XATEXIT) */
-#endif /* !defined(HAVE_ATEXIT) && defined(HAVE_ON_EXIT) */
-
 #if defined(HAVE_VHANGUP) && !defined(HAVE_DEV_PTMX)
 #  define USE_VHANGUP
 #endif /* defined(HAVE_VHANGUP) && !defined(HAVE_DEV_PTMX) */