diff --git a/posix/uname-values.h b/posix/uname-values.h
new file mode 100644
index 0000000..1e01118
--- /dev/null
+++ b/posix/uname-values.h
@@ -0,0 +1,28 @@
+/* Constant values for the uname function to return.  Generic version.
+   Copyright (C) 2015 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
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
+
+/* This file exists so that it can be replaced by sysdeps variants.
+   It must define these macros with string values:
+        UNAME_SYSNAME
+        UNAME_RELEASE
+        UNAME_VERSION
+        UNAME_MACHINE
+   If there is no sysdeps file, this file will just proxy to the file
+   created by posix/Makefile.  */
+
+#include <config-name.h>
diff --git a/posix/uname.c b/posix/uname.c
index d4276d3..072e868 100644
--- a/posix/uname.c
+++ b/posix/uname.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 1991-2015 Free Software Foundation, Inc.
+/* uname -- Report basic information about the system.  Generic version.
+   Copyright (C) 1991-2015 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
@@ -20,8 +21,8 @@
 #include <sys/utsname.h>
 #include <unistd.h>
 
-/* This file is created by the configuration process, and defines UNAME_*.  */
-#include <config-name.h>
+/* This file defines UNAME_* to string constants.  */
+#include <uname-values.h>
 
 /* Put information about the system in NAME.  */
 int
diff --git a/sysdeps/arm/nacl/uname-values.h b/sysdeps/arm/nacl/uname-values.h
new file mode 100644
index 0000000..f1e11be
--- /dev/null
+++ b/sysdeps/arm/nacl/uname-values.h
@@ -0,0 +1,20 @@
+/* Constant values for the uname function to return.  NaCl/ARM version.
+   Copyright (C) 2015 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
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
+
+#define UNAME_MACHINE "arm"
+#include <sysdeps/nacl/uname-values.h>
diff --git a/sysdeps/nacl/uname-values.h b/sysdeps/nacl/uname-values.h
new file mode 100644
index 0000000..b78eac5
--- /dev/null
+++ b/sysdeps/nacl/uname-values.h
@@ -0,0 +1,32 @@
+/* Constant values for the uname function to return.  NaCl version.
+   Copyright (C) 2015 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
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
+
+/* This file must define these macros with string values:
+        UNAME_SYSNAME
+        UNAME_RELEASE
+        UNAME_VERSION
+        UNAME_MACHINE
+*/
+
+#ifndef UNAME_MACHINE
+# error "sysdeps/MACHINE/nacl/uname-values.h should define UNAME_MACHINE"
+#endif
+
+#define UNAME_SYSNAME "NaCl"
+#define UNAME_RELEASE "unknown"
+#define UNAME_VERSION "unknown"
