diff --git a/ChangeLog b/ChangeLog
index 8ae11926b4..e4c590f032 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2000-03-27  Roland McGrath  <roland@baalperazim.frob.com>
 
+	* stdio-common/tmpfile.c: Use <shlib-compat.h> macros.
+
 	* include/shlib-compat.h: Conditionalize <abi-versions.h> include
 	on [HAVE_ELF && DO_VERSIONING].
 
diff --git a/stdio-common/tmpfile.c b/stdio-common/tmpfile.c
index ccf0630fa1..c5151b8b87 100644
--- a/stdio-common/tmpfile.c
+++ b/stdio-common/tmpfile.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991,1993,1996,1997,1998,1999 Free Software Foundation, Inc.
+/* Copyright (C) 1991,93,96,97,98,99,2000 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -54,11 +54,10 @@ tmpfile (void)
 
 #ifdef USE_IN_LIBIO
 # undef tmpfile
-# if defined PIC && DO_VERSIONING
-default_symbol_version (__new_tmpfile, tmpfile, GLIBC_2.1);
+# include <shlib-compat.h>
+versioned_symbol (libc, __new_tmpfile, tmpfile, GLIBC_2_1);
 # else
 #  ifdef weak_alias
 weak_alias (__new_tmpfile, tmpfile)
 #  endif
-# endif
 #endif