diff --git a/samples/arm-hardrpi-linux-gnueabi/crosstool.config b/samples/armv6-rpi-linux-gnueabi/crosstool.config
similarity index 74%
rename from samples/arm-hardrpi-linux-gnueabi/crosstool.config
rename to samples/armv6-rpi-linux-gnueabi/crosstool.config
index 029cf877..d50f4e5d 100644
--- a/samples/arm-hardrpi-linux-gnueabi/crosstool.config
+++ b/samples/armv6-rpi-linux-gnueabi/crosstool.config
@@ -2,12 +2,15 @@ CT_EXPERIMENTAL=y
 CT_LOCAL_TARBALLS_DIR="${HOME}/src"
 CT_SAVE_TARBALLS=y
 CT_LOG_EXTRA=y
-CT_ARCH_ARCH="armv6"
+CT_ARCH_ARCH="armv6zk"
+CT_ARCH_CPU="arm1176jzf-s"
+CT_ARCH_TUNE="arm1176jzf-s"
 CT_ARCH_FPU="vfp"
 CT_ARCH_arm=y
-CT_TARGET_VENDOR="hardrpi"
+CT_ARCH_SUFFIX="v6"
+CT_TARGET_VENDOR="rpi"
 CT_KERNEL_linux=y
-CT_KERNEL_V_3_2_36=y
+CT_KERNEL_V_3_6_11=y
 CT_BINUTILS_V_2_22=y
 CT_BINUTILS_LINKER_LD_GOLD=y
 CT_BINUTILS_GOLD_THREADS=y
@@ -18,6 +21,7 @@ CT_CC_LANG_CXX=y
 # CT_CC_STATIC_LIBSTDCXX is not set
 CT_CC_GCC_DISABLE_PCH=y
 CT_CC_GCC_BUILD_ID=y
+CT_CC_GCC_LNK_HASH_STYLE_BOTH=y
 CT_LIBC_EGLIBC_V_2_16=y
 CT_EGLIBC_OPT_SIZE=y
 CT_LIBC_GLIBC_KERNEL_VERSION_CHOSEN=y
diff --git a/samples/arm-hardrpi-linux-gnueabi/reported.by b/samples/armv6-rpi-linux-gnueabi/reported.by
similarity index 100%
rename from samples/arm-hardrpi-linux-gnueabi/reported.by
rename to samples/armv6-rpi-linux-gnueabi/reported.by