diff --git a/ChangeLog b/ChangeLog
index 47729b2..90f665d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2015-11-19  Ben Elliston  <bje@gnu.org>
+
+	Reported by Owen Urkov <owen@asperasoft.com>.
+	* config.guess (amd64:Isilon OneFS:*:*): New.
+	* config.sub (-onefs*): New.
+	* testsuite/config-guess.data: Add a test case.
+	* testsuite/config-sub.data: Likewise.
+
 2015-10-21  Pavel Janík  <pavel@janik.cz>
 
 	* config.guess (pc:*:*:*): Comment tweak.
diff --git a/config.guess b/config.guess
index b3f9053..fba6e87 100755
--- a/config.guess
+++ b/config.guess
@@ -2,7 +2,7 @@
 # Attempt to guess a canonical system name.
 #   Copyright 1992-2015 Free Software Foundation, Inc.
 
-timestamp='2015-10-21'
+timestamp='2015-11-19'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -1393,6 +1393,9 @@ EOF
     x86_64:VMkernel:*:*)
 	echo ${UNAME_MACHINE}-unknown-esx
 	exit ;;
+    amd64:Isilon\ OneFS:*:*)
+        echo x86_64-unknown-onefs
+	exit ;;
 esac
 
 cat >&2 <<EOF
diff --git a/config.sub b/config.sub
index 1acc966..b8d3d80 100755
--- a/config.sub
+++ b/config.sub
@@ -2,7 +2,7 @@
 # Configuration validation subroutine script.
 #   Copyright 1992-2015 Free Software Foundation, Inc.
 
-timestamp='2015-08-20'
+timestamp='2015-11-19'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -1399,7 +1399,8 @@ case $os in
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
+	      | -onefs* | -tirtos*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
diff --git a/testsuite/config-guess.data b/testsuite/config-guess.data
index f45a4a6..fa94194 100644
--- a/testsuite/config-guess.data
+++ b/testsuite/config-guess.data
@@ -9,6 +9,7 @@ amd64   6.1.5_PATCH NetBSD  ignored x86_64  x86_64-unknown-netbsd6.1
 amd64   7.0_BETA NetBSD ignored x86_64  x86_64-unknown-netbsd7.0
 amd64   7.0 NetBSD	ignored x86_64  x86_64-unknown-netbsd7.0
 amd64   7.0_RC1 NetBSD  ignored x86_64  x86_64-unknown-netbsd7.0
+amd64	7.2.1	Isilon\ OneFS	ignored	ignored	x86_64-unknown-onefs
 arceb	ignored	Linux	ignored	ignored	arceb-unknown-linux-gnu
 arc	ignored	Linux	ignored	ignored	arc-unknown-linux-gnu
 arm	ignored	riscos	ignored	ignored	arm-unknown-riscos
diff --git a/testsuite/config-sub.data b/testsuite/config-sub.data
index 5fff2c6..8eee271 100644
--- a/testsuite/config-sub.data
+++ b/testsuite/config-sub.data
@@ -8,6 +8,7 @@ aarch64-unknown-elf		aarch64-unknown-elf
 aarch64-unknown-linux		aarch64-unknown-linux-gnu
 amd64-cygwin			x86_64-pc-cygwin
 amd64-kfreebsd5.4-gnu		x86_64-pc-kfreebsd5.4-gnu
+amd64-onefs			x86_64-pc-onefs
 amd64-unknown-freebsd5.2	x86_64-unknown-freebsd5.2
 arceb-linux			arceb-unknown-linux-gnu
 arc-linux			arc-unknown-linux-gnu