diff --git a/ChangeLog b/ChangeLog
index 8e23821e1..8899cf28a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 20000117
  - Clean up bsd-bindresvport.c. Use arc4random() for picking initial
    port, ignore EINVAL errors (Linux) when searching for free port.
+ - Revert __snprintf -> snprintf aliasing. Apparently Solaris 
+   __snprintf isn't. Report from Theo de Raadt <theo@cvs.openbsd.org>
 
 20000116
  - Renamed --with-xauth-path to --with-xauth
diff --git a/configure.in b/configure.in
index a5a97e7ab..7b8b46b42 100644
--- a/configure.in
+++ b/configure.in
@@ -144,7 +144,7 @@ dnl Checks for header files.
 AC_CHECK_HEADERS(bstring.h endian.h lastlog.h login.h maillock.h netdb.h netgroup.h paths.h poll.h pty.h shadow.h security/pam_appl.h sys/bitypes.h sys/bsdtty.h sys/cdefs.h sys/poll.h sys/select.h sys/stropts.h sys/time.h sys/ttcompat.h util.h utmp.h utmpx.h)
 
 dnl Checks for library functions.
-AC_CHECK_FUNCS(arc4random bindresvport_af freeaddrinfo gai_strerror getaddrinfo getpagesize getnameinfo innetgr md5_crypt mkdtemp openpty rresvport_af setenv seteuid setlogin setproctitle setreuid snprintf strlcat strlcpy updwtmpx vsnprintf _getpty __snprintf __vsnprintf)
+AC_CHECK_FUNCS(arc4random bindresvport_af freeaddrinfo gai_strerror getaddrinfo getpagesize getnameinfo innetgr md5_crypt mkdtemp openpty rresvport_af setenv seteuid setlogin setproctitle setreuid snprintf strlcat strlcpy updwtmpx vsnprintf _getpty)
 
 AC_CHECK_FUNC(login, 
 	[AC_DEFINE(HAVE_LOGIN)],
diff --git a/defines.h b/defines.h
index 9c88f2e85..7cd9b80ee 100644
--- a/defines.h
+++ b/defines.h
@@ -236,13 +236,4 @@ typedef unsigned int size_t;
 # define PAM_STRERROR(a,b) pam_strerror((a),(b))
 #endif
 
-/* Solaris doesn't have a public [v]snprintf() function, but it has */
-/* __[v]snprintf() */
-#if !defined(HAVE_SNPRINTF) && defined(HAVE___SNPRINTF)
-# define snprintf __snprintf
-#endif /* !defined(HAVE_SNPRINTF) && defined(HAVE___SNPRINTF) */
-#if !defined(HAVE_VSNPRINTF) && defined(HAVE___VSNPRINTF)
-# define vsnprintf __vsnprintf
-#endif /* !defined(HAVE_VSNPRINTF) && defined(HAVE___VSNPRINTF) */
-
 #endif /* _DEFINES_H */