diff --git a/ChangeLog b/ChangeLog
index 95f0f0c1a20e9cb2fd59bb10b9c4c7f72906becf..ce247c8412274d3639118a416e1e22ef77e2e281 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-07-04  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Merge from gnulib.
+	* lib/alloca.in.h: New version from gnulib, incorporating:
+	2012-07-03 alloca: add support for HP NonStop TNS/E native
+
 2012-07-04  Dmitry Antipov  <dmantipov@yandex.ru>
 
 	* configure.in: If --enable-gcc-warnings, disable
diff --git a/lib/alloca.in.h b/lib/alloca.in.h
index e94eb68c3c82c991afb1f339366ee186da8a7979..d20f4b8f1c3d1d82e144dd6ffc9553845d8d369f 100644
--- a/lib/alloca.in.h
+++ b/lib/alloca.in.h
@@ -44,6 +44,13 @@
 #  define alloca _alloca
 # elif defined __DECC && defined __VMS
 #  define alloca __ALLOCA
+# elif defined __TANDEM && defined _TNS_E_TARGET
+#  ifdef  __cplusplus
+extern "C"
+#  endif
+void *_alloca (unsigned short);
+#  pragma intrinsic (_alloca)
+#  define alloca _alloca
 # else
 #  include <stddef.h>
 #  ifdef  __cplusplus