diff --git a/config/path b/config/path
index 1fb3ccbb0e..1022476e5a 100644
--- a/config/path
+++ b/config/path
@@ -2,6 +2,11 @@ set -e
 
 # determine architecture's family
 case $TARGET_ARCH in
+  arm)
+    TARGET_FAMILY=arm
+    TARGET_ABI=eabi
+    ;;
+
   i386)
     TARGET_FAMILY=i686
     ;;
@@ -14,12 +19,16 @@ esac
 # determines TARGET_CPU, if not forced by user
 if [ -z "$TARGET_CPU" ]; then
   case $TARGET_ARCH in
+    arm)
+      TARGET_CPU=cortex-a8
+      ;;
+
     i386)
       TARGET_CPU=i686
       ;;
 
     x86_64)
-      TARGET_CPU=i686
+      TARGET_CPU=core2
       ;;
   esac
 fi
@@ -34,7 +43,7 @@ fi
   ADDONS=addons
 
 HOST_NAME=`$SCRIPTS/configtools/config.guess`
-TARGET_NAME=$TARGET_FAMILY-openelec-linux-gnu
+TARGET_NAME=${TARGET_FAMILY}-openelec-linux-gnu${TARGET_ABI}
 
 BUILD=$BUILD_BASE.$DISTRONAME-$PROJECT.$TARGET_ARCH-$OPENELEC_VERSION
 TARGET_IMG=$ROOT/$TARGET
@@ -115,14 +124,20 @@ TARGET_LDFLAGS="$GCC_OPTIM $LD_OPTIM"
 case $TARGET_ARCH in
     i386)
      TARGET_CFLAGS="$TARGET_CFLAGS -march=$TARGET_CPU -m32"
-     TARGET_CXXFLAGS="$TARGET_CXXFLAGS -march=$TARGET_CPU -m32"
+     TARGET_CXXFLAGS="$TARGET_CFLAGS"
      TARGET_LDFLAGS="$TARGET_LDFLAGS -march=$TARGET_CPU -m32"
      ;;
     x86_64)
      TARGET_CFLAGS="$TARGET_CFLAGS -fPIC -march=$TARGET_CPU -m64"
-     TARGET_CXXFLAGS="$TARGET_CXXFLAGS -fPIC -march=$TARGET_CPU -m64"
+     TARGET_CXXFLAGS="$TARGET_CFLAGS"
      TARGET_LDFLAGS="$TARGET_LDFLAGS -fPIC -march=$TARGET_CPU -m64"
      ;;
+    arm)
+     TARGET_CFLAGS="$TARGET_CFLAGS -fPIC -mcpu=$TARGET_CPU"
+     [ -n "$TARGET_FPU" ] && TARGET_CFLAGS="$TARGET_CFLAGS -mfpu=$TARGET_FPU"
+     TARGET_CXXFLAGS="$TARGET_CFLAGS"
+     TARGET_LDFLAGS="$TARGET_LDFLAGS -fPIC -mcpu=$TARGET_CPU"
+     ;;
 esac
 
 TARGET_PKG_CONFIG_PATH=""