Index: tools/configure
===================================================================
--- tools/configure	(revision 13791)
+++ tools/configure	(working copy)
@@ -524,7 +524,7 @@
 
  ==iAudio==            ==Toshiba==            ==SanDisk==
  30) X5/X5V/X5L        40) Gigabeat F         50) Sansa e200
- 31) M5/M5L                                   51) Sansa e200R
+ 31) M5/M5L            41) Gigabeat S         51) Sansa e200R
 
  ==Tatung==
  60) Elio TPJ-1022
@@ -1220,7 +1220,32 @@
     t_manufacturer="tatung"
     t_model="tpj1022"
     ;;
+    
+   41|gigabeats)
+    target_id=26
+    archos="gigabeats"
+    target="-DGIGABEAT_S"
+    memory=32 # always
+    arm9tdmicc
+    tool="$rootdir/tools/scramble -add=gigs"
+    bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
+    bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
+    output="rockbox.gigabeat"
+    appextra="recorder:gui"
+    archosrom=""
+    flash=""
+    plugins="yes"
+    codecs="libmad liba52 libffmpegFLAC libwma libTremor libwavpack libmusepack libalac libfaad libm4a libspeex libdemac"
+    toolset=$gigabeatbitmaptools
+    boottool="$rootdir/tools/scramble -gigabeat" #FIXME: Needs to build a nk.bin
+    bootoutput="bootloader.bin"
+    # architecture, manufacturer and model for the target-tree build
+    t_cpu="arm"
+    t_manufacturer="toshiba"
+    t_model="gigabeat-s"
+    ;;
 
+  
    *)
     echo "Please select a supported target platform!"
     exit
Index: tools/scramble.c
===================================================================
--- tools/scramble.c	(revision 13791)
+++ tools/scramble.c	(working copy)
@@ -226,6 +226,8 @@
             modelnum = 17;
         else if(!strcmp(&argv[1][5], "giga"))
             modelnum = 18;
+        else if(!strcmp(&argv[1][5], "gigs"))
+            modelnum = 19;
         else {
             fprintf(stderr, "unsupported model: %s\n", &argv[1][5]);
             return 2;
Index: bootloader/SOURCES
===================================================================
--- bootloader/SOURCES	(revision 13791)
+++ bootloader/SOURCES	(working copy)
@@ -4,6 +4,8 @@
 ipod.c
 #elif defined(GIGABEAT_F)
 gigabeat.c
+#elif defined(GIGABEAT_S)
+gigabeat-s.c
 #elif defined(IRIVER_H10) || defined(IRIVER_H10_5GB) || defined(SANSA_E200)
 main-pp.c
 #elif defined(ELIO_TPJ1022)
Index: firmware/export/config.h
===================================================================
--- firmware/export/config.h	(revision 13791)
+++ firmware/export/config.h	(working copy)
@@ -64,6 +64,7 @@
 #define SANSA_E200_PAD     12
 #define ELIO_TPJ1022_PAD   13
 #define ARCHOS_AV300_PAD   14
+#define GIGABEAT_S_PAD     15
 
 /* CONFIG_REMOTE_KEYPAD */
 #define H100_REMOTE 1
@@ -190,6 +191,8 @@
 #include "config-ifp7xx.h"
 #elif defined(GIGABEAT_F)
 #include "config-gigabeat.h"
+#elif defined(GIGABEAT_S)
+#include "config-gigabeat-s.h"
 #elif defined(IPOD_MINI)
 #include "config-ipodmini.h"
 #elif defined(IPOD_MINI2G)
Index: firmware/SOURCES
===================================================================
--- firmware/SOURCES	(revision 13791)
+++ firmware/SOURCES	(working copy)
@@ -535,6 +535,28 @@
 #endif /* SIMULATOR */
 #endif /* GIGABEAT_F */
 
+#ifdef GIGABEAT_S
+#ifndef SIMULATOR
+target/arm/toshiba/gigabeat-s/adc-meg-fx.c
+target/arm/toshiba/gigabeat-s/ata-meg-fx.c
+target/arm/toshiba/gigabeat-s/backlight-meg-fx.c
+target/arm/toshiba/gigabeat-s/button-meg-fx.c
+target/arm/toshiba/gigabeat-s/i2c-meg-fx.c
+target/arm/toshiba/gigabeat-s/lcd-as-meg-fx.S
+target/arm/toshiba/gigabeat-s/lcd-meg-fx.c
+target/arm/toshiba/gigabeat-s/power-meg-fx.c
+target/arm/toshiba/gigabeat-s/sc606-meg-fx.c
+target/arm/toshiba/gigabeat-s/usb-meg-fx.c
+target/arm/toshiba/gigabeat-s/wmcodec-meg-fx.c
+target/arm/toshiba/gigabeat-s/dma_start.c
+target/arm/toshiba/gigabeat-s/system-meg-fx.c
+target/arm/toshiba/gigabeat-s/mmu-meg-fx.c
+#ifndef BOOTLOADER
+target/arm/toshiba/gigabeat-s/pcm-meg-fx.c
+#endif
+#endif /* SIMULATOR */
+#endif /* GIGABEAT_S */
+
 #ifdef ELIO_TPJ1022
 #ifndef SIMULATOR
 target/arm/ata-as-arm.S
Index: firmware/drivers/lcd-16bit.c
===================================================================
--- firmware/drivers/lcd-16bit.c	(revision 13791)
+++ firmware/drivers/lcd-16bit.c	(working copy)
@@ -684,7 +684,8 @@
     lcd_bitmap_part(src, 0, 0, width, x, y, width, height);
 }
 
-#if !defined(TOSHIBA_GIGABEAT_F) || defined(SIMULATOR)
+#if !defined(TOSHIBA_GIGABEAT_F) && !defined(TOSHIBA_GIGABEAT_S) \
+        || defined(SIMULATOR)
 /* Draw a partial native bitmap */
 void lcd_bitmap_transparent_part(const fb_data *src, int src_x, int src_y,
                                  int stride, int x, int y, int width,