diff --git a/ChangeLog b/ChangeLog
index 5c6fbf2..9396ee8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2017-11-23  Olivier Hainque  <hainque@adacore.com>
+
+	* config.sub: Map -pikeos to baremetal.
+	* testsuite/config-sub.data: Add tests for a few pikeos
+	configuration variants.
+
 2017-11-07  Ben Elliston  <bje@gnu.org>
 
 	Thanks to Urs Janßen.
diff --git a/config.sub b/config.sub
index fb57947..00f68b8 100755
--- a/config.sub
+++ b/config.sub
@@ -2,7 +2,7 @@
 # Configuration validation subroutine script.
 #   Copyright 1992-2017 Free Software Foundation, Inc.
 
-timestamp='2017-11-04'
+timestamp='2017-11-23'
 
 # 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
@@ -1546,6 +1546,19 @@ case $os in
 	-dicos*)
 		os=-dicos
 		;;
+	-pikeos*)
+		# Until real need of OS specific support for
+		# particular features comes up, bare metal
+		# configurations are quite functional.
+		case $basic_machine in
+		    arm*)
+			os=-eabi
+			;;
+		    *)
+			os=-elf
+			;;
+		esac
+		;;
 	-nacl*)
 		;;
 	-ios)
diff --git a/testsuite/config-sub.data b/testsuite/config-sub.data
index 807a2af..af5bd88 100644
--- a/testsuite/config-sub.data
+++ b/testsuite/config-sub.data
@@ -50,7 +50,9 @@ arm-elf						arm-unknown-elf
 armle						armle-unknown-none
 arm-linux-androideabi				arm-unknown-linux-androideabi
 arm-mingw32ce					arm-unknown-mingw32ce
+arm-pikeos					arm-unknown-eabi
 arm-riscos					arm-unknown-riscos
+arm-sysgo-pikeos				arm-sysgo-eabi
 arm-tirtos					arm-unknown-tirtos
 arm-unknown-netbsdelf7.0			arm-unknown-netbsdelf7.0
 arm-unknown-riscos				arm-unknown-riscos
@@ -358,6 +360,8 @@ powerpc-elf-lynxos				powerpc-elf-lynxos
 powerpc-haiku					powerpc-unknown-haiku
 powerpcle					powerpcle-unknown-none
 powerpc						powerpc-unknown-none
+powerpc-pikeos					powerpc-unknown-elf
+powerpc-sysgo-pikeos				powerpc-sysgo-elf
 powerpc-xcoff-lynxos178				powerpc-xcoff-lynxos178
 ppcbe-elf					powerpc-unknown-elf
 ppcbe-none-elf					powerpc-none-elf