2 files changed, 31 insertions, 9 deletions

diff --git a/tools/configure b/tools/configure
index d14875aef1..33c272d1b1 100755
--- a/tools/configure
+++ b/tools/configure
@@ -900,14 +900,14 @@ cat <<EOF
  ==Onda==                                        59) Sansa c200v2
  120) VX747               ==Meizu==              60) Sansa Clipv2
  121) VX767               110) M6SL              61) Sansa View
- 122) VX747+              111) M6SP
- 123) VX777               112) M3                ==Logik==
-                                                 80) DAX 1GB MP3/DAB
- ==Samsung==              ==Tatung==
- 140) YH-820              150) Elio TPJ-1022     ==Lyre project==
- 141) YH-920                                     130) Lyre proto 1
- 142) YH-925                                     131) Mini2440
- 143) YP-S3
+ 122) VX747+              111) M6SP              62) Sansa Clip+
+ 123) VX777               112) M3
+                                                 ==Logik==
+ ==Samsung==              ==Tatung==             80) DAX 1GB MP3/DAB
+ 140) YH-820              150) Elio TPJ-1022
+ 141) YH-920                                     ==Lyre project==1
+ 142) YH-925                                     130) Lyre proto 1
+ 143) YP-S3                                      131) Mini2440
 EOF
 
   buildfor=`input`;
@@ -2048,6 +2048,26 @@ fi
     t_model="sansa-view"
     ;;
 
+   62|sansaclipplus)
+    target_id=66
+    modelname="sansaclipplus"
+    target="-DSANSA_CLIPPLUS"
+    memory=8
+    arm926ejscc
+    bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
+    bmp2rb_native="$bmp2rb_mono"
+    tool="$rootdir/tools/scramble -add=cli+"
+    output="rockbox.sansa"
+    bootoutput="bootloader-clipplus.sansa"
+    appextra="recorder:gui"
+    plugins="yes"
+    swcodec="yes"
+    toolset=$scramblebitmaptools
+    t_cpu="arm"
+    t_manufacturer="as3525"
+    t_model="sansa-clipplus"
+    ;;
+
    150|tatungtpj1022)
     target_id=25
     modelname="tatungtpj1022"
diff --git a/tools/scramble.c b/tools/scramble.c
index 9bfdbda905..3ee8b26aa4 100644
--- a/tools/scramble.c
+++ b/tools/scramble.c
@@ -125,7 +125,7 @@ void usage(void)
            "\t                   tpj2, c200, e200, giga, gigs, m100, m500, d2,\n");
     printf("\t                   9200, 1630, 6330, ldax, m200, c100, clip, e2v2,\n"
            "\t                   m2v4, fuze, c2v2, clv2, y820, y920, y925, x747,\n"
-           "\t                   747p, x777, nn2g, m244)\n");
+           "\t                   747p, x777, nn2g, m244, cli+)\n");
     printf("\nNo option results in Archos standard player/recorder format.\n");
 
     exit(1);
@@ -320,6 +320,8 @@ int main (int argc, char** argv)
             modelnum = 64;
         else if (!strcmp(&argv[1][5], "6330")) /* Philips HDD6330 */
             modelnum = 65;
+        else if (!strcmp(&argv[1][5], "cli+")) /* Sansa Clip+ */
+            modelnum = 66;
         else if (!strcmp(&argv[1][5], "m244"))
             modelnum = 131;
         else {