diff --git a/ChangeLog b/ChangeLog
index bb95d03e66..053e623dc5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2012-05-30  Richard Henderson  <rth@twiddle.net>
 
+	* sysdeps/unix/make-syscalls.sh: Protect symbol_version output
+	with #ifndef NOT_IN_libc.
+
 	* scripts/abilist.awk: Accept 8 fields.  Handle Alpha functions
 	marked to avoid plt entry.
 
diff --git a/sysdeps/unix/make-syscalls.sh b/sysdeps/unix/make-syscalls.sh
index cedce3193c..2bc7cc02a8 100644
--- a/sysdeps/unix/make-syscalls.sh
+++ b/sysdeps/unix/make-syscalls.sh
@@ -76,6 +76,7 @@ emit_weak_aliases()
       *@@*)
 	base=`echo $name | sed 's/@@.*//'`
 	ver=`echo $name | sed 's/.*@@//'`
+	echo "	 echo '#ifndef NOT_IN_libc'; \\"
 	if test -z "$vcount" ; then
 	  source=$strong
 	  vcount=1
@@ -85,10 +86,14 @@ emit_weak_aliases()
 	  echo "	 echo 'strong_alias ($strong, $source)'; \\"
 	fi
 	echo "	 echo 'default_symbol_version($source, $base, $ver)'; \\"
+	echo "	 echo '#else'; \\"
+	echo "	 echo 'strong_alias ($strong, $base)'; \\"
+	echo "	 echo '#endif'; \\"
 	;;
       *@*)
 	base=`echo $name | sed 's/@.*//'`
 	ver=`echo $name | sed 's/.*@//'`
+	echo "	 echo '#ifndef NOT_IN_libc'; \\"
 	if test -z "$vcount" ; then
 	  source=$strong
 	  vcount=1
@@ -98,6 +103,7 @@ emit_weak_aliases()
 	  echo "	 echo 'strong_alias ($strong, $source)'; \\"
 	fi
 	echo "	 echo 'symbol_version ($source, $base, $ver)'; \\"
+	echo "	 echo '#endif'; \\"
 	;;
       !*)
 	name=`echo $name | sed 's/.//'`