diff --git a/Makefile b/Makefile
index bf7a1ba..49bffaf 100644
--- a/Makefile
+++ b/Makefile
@@ -70,14 +70,17 @@ else
else ifneq (,$(findstring linux,$(gcc_machine)))
detected_openhome_system = Linux
endif
- ifeq ($(gcc_machine),arm-none-linux-gnueabi)
- detected_openhome_architecture = armel
- endif
- ifeq ($(gcc_machine),arm-linux-gnueabi)
- detected_openhome_architecture = armel
- endif
- ifeq ($(gcc_machine),arm-linux-gnueabihf)
- detected_openhome_architecture = armhf
+ ifneq (,$(findstring arm,$(gcc_machine)))
+ ifneq (,$(findstring linux-gnueabihf,$(gcc_machine)))
+ detected_openhome_architecture = armhf
+ else ifneq (,$(findstring armv7hl,$(gcc_machine)))
+ # cubox: armv7hl-redhat-linux-gnueabi
+ detected_openhome_architecture = armhf
+ else ifeq (${detected_openhome_system},Qnap)
+ detected_openhome_architecture = x19
+ else
+ detected_openhome_architecture = armel
+ endif
endif
ifneq (,$(findstring i686,$(gcc_machine)))
detected_openhome_architecture = x86