diff --git a/samples/armv6-rpi-linux-gnueabi/crosstool.config b/samples/armv6-unknown-linux-gnueabi/crosstool.config
similarity index 100%
rename from samples/armv6-rpi-linux-gnueabi/crosstool.config
rename to samples/armv6-unknown-linux-gnueabi/crosstool.config
diff --git a/samples/armv6-rpi-linux-gnueabi/reported.by b/samples/armv6-unknown-linux-gnueabi/reported.by
similarity index 100%
rename from samples/armv6-rpi-linux-gnueabi/reported.by
rename to samples/armv6-unknown-linux-gnueabi/reported.by
diff --git a/samples/armv6-unknown-linux-gnueabihf/crosstool.config b/samples/armv6-unknown-linux-gnueabihf/crosstool.config
new file mode 100644
index 00000000..1104c7b7
--- /dev/null
+++ b/samples/armv6-unknown-linux-gnueabihf/crosstool.config
@@ -0,0 +1,20 @@
+CT_CONFIG_VERSION="3"
+CT_ARCH_ARM=y
+CT_ARCH_CPU="arm1176jzf-s"
+CT_ARCH_SUFFIX="v6"
+CT_ARCH_FPU="vfp"
+CT_ARCH_FLOAT_HW=y
+CT_TARGET_VENDOR="rpi"
+CT_KERNEL_LINUX=y
+CT_LINUX_V_5_4=y
+CT_BINUTILS_LINKER_LD_GOLD=y
+CT_BINUTILS_GOLD_THREADS=y
+CT_BINUTILS_LD_WRAPPER=y
+CT_BINUTILS_PLUGINS=y
+CT_GLIBC_LOCALES=y
+CT_CC_GCC_DISABLE_PCH=y
+CT_CC_GCC_BUILD_ID=y
+CT_CC_GCC_LNK_HASH_STYLE_BOTH=y
+CT_CC_LANG_CXX=y
+CT_DEBUG_GDB=y
+# CT_GDB_CROSS_PYTHON is not set
diff --git a/samples/armv6-unknown-linux-gnueabihf/reported.by b/samples/armv6-unknown-linux-gnueabihf/reported.by
new file mode 100644
index 00000000..c60cdd43
--- /dev/null
+++ b/samples/armv6-unknown-linux-gnueabihf/reported.by
@@ -0,0 +1,3 @@
+reporter_name="Yann E. MORIN"
+reporter_url="http://ymorin.is-a-geek.org/"
+reporter_comment="Toolchain for the Raspberry Pi, with hard-float."