2 files changed, 27 insertions, 2 deletions

diff --git a/tools/configure b/tools/configure
index bfc581f6c0..52eef68008 100755
--- a/tools/configure
+++ b/tools/configure
@@ -1512,7 +1512,7 @@ cat <<EOF
  208) Samsung YP-R1       231) 960               225) NWZ-E580 series
                                                  226) NWZ-A10 series
  ==iBasso==                                      227) NW-A20 series
- 232) DX50
+ 232) DX50                                       228) NWZ-A860 series
  233) DX90
 
 EOF
@@ -4007,6 +4007,29 @@ fi
     sonynwzcc
     ;;
 
+   228|sonynwza860)
+    application="yes"
+    target_id=103
+    modelname="sonynwza860"
+    target="SONY_NWZA860"
+    memory=16
+    bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
+    bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
+    tool="cp"
+    output="rockbox.sony"
+    boottool="$rootdir/tools/scramble -add=a860"
+    bootoutput="bootloader-nwza860.sony"
+    appextra="gui:recorder"
+    plugins=""
+    swcodec="yes"
+    toolset=$genericbitmaptools
+    t_cpu="hosted"
+    t_manufacturer="sonynwz"
+    t_model="nwza860"
+    uname=`uname`
+    sonynwzcc
+    ;;
+
    230|ihifi760)
     target_id=92
     modelname="ihifi760"
diff --git a/tools/scramble.c b/tools/scramble.c
index 935eae002f..5ff45b3e44 100644
--- a/tools/scramble.c
+++ b/tools/scramble.c
@@ -130,7 +130,7 @@ void usage(void)
            "\t                   747p, x777, nn2g, m244, cli+, fuz2, hd20, hd30,\n"
            "\t                   ip6g, rk27, clzp, zxf2, zxf3, fuz+, e370, e360,\n"
            "\t                   zxfi, zmoz, zen, zenv, ypz5, zxfs, e450, e460,\n"
-           "\t                   e470,e580,a10,a20)\n");
+           "\t                   e470,e580,a10,a20,a860)\n");
     printf("\nNo option results in Archos standard player/recorder format.\n");
 
     exit(1);
@@ -395,6 +395,8 @@ int main (int argc, char** argv)
             modelnum = 104;
         else if (!strcmp(&argv[1][5], "a20")) /* Sony NW-A20 series */
             modelnum = 106;
+        else if (!strcmp(&argv[1][5], "a860")) /* Sony NWZ-A860 series */
+            modelnum = 107;
         else {
             fprintf(stderr, "unsupported model: %s\n", &argv[1][5]);
             return 2;