--- a/ohbuild.sh
+++ b/ohbuild.sh
@@ -73,7 +73,7 @@
         -b) opt_b=1; shift ;;
         -c) opt_c=1; shift ;;
         --) shift ; break ;;
-        *) echo "Internal error!" ; exit 1 ;;
+        *) usage ;;
     esac
 done
 
@@ -177,6 +177,38 @@
     # Tue May 9 08:54:47 2017 
     git checkout e3edb912410d4c5a4d5323bb1e9c27660a42d78f || exit 1
     git checkout Makefile
+    patch -p1 << "EOF"
+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
+EOF
 
     cd  $topdir/ohTopology
     # Wed Mar 22 11:15:28 2017 +0000