diff --git a/apps/recorder/jpeg_idct_arm.S b/apps/recorder/jpeg_idct_arm.S
index 75e3e4d..a12d4b2 100644
--- a/apps/recorder/jpeg_idct_arm.S
+++ b/apps/recorder/jpeg_idct_arm.S
@@ -132,7 +132,7 @@ jpeg_idct2h:
     mvnhi  r4,  r4,  asr #31
 #ifdef HAVE_LCD_COLOR
     strb   r5,  [r1]
-    strb   r4,  [r1, #4]
+    strb   r4,  [r1, #3]
 #else
     strb   r5,  [r1]
     strb   r4,  [r1, #1]
@@ -154,7 +154,7 @@ jpeg_idct2h:
     usat   r12, #8,  r12, asr #5
 #ifdef HAVE_LCD_COLOR
     strb   r4,  [r1]
-    strb   r12, [r1, #4]
+    strb   r12, [r1, #3]
 #else
     strb   r4,  [r1]
     strb   r12, [r1, #1]
@@ -327,9 +327,9 @@ jpeg_idct4h:
     mvnhi  r5,  r5,  asr #31
 #ifdef HAVE_LCD_COLOR
     strb   r9,  [r1]
-    strb   r8,  [r1, #4]
-    strb   r4,  [r1, #8]
-    strb   r5,  [r1, #12]
+    strb   r8,  [r1, #3]
+    strb   r4,  [r1, #6]
+    strb   r5,  [r1, #9]
 #else
     strb   r9,  [r1]
     strb   r8,  [r1, #1]
@@ -374,9 +374,9 @@ jpeg_idct4h:
     mvnhi  r9,  r9,  asr #31
 #ifdef HAVE_LCD_COLOR
     strb   r6,  [r1]
-    strb   r14, [r1, #4]
-    strb   r12, [r1, #8]
-    strb   r9,  [r1, #12]
+    strb   r14, [r1, #3]
+    strb   r12, [r1, #6]
+    strb   r9,  [r1, #9]
 #else
     strb   r6,  [r1]
     strb   r14, [r1, #1]
@@ -412,9 +412,9 @@ jpeg_idct4h:
     usat  r14, #8,  r14, asr #18
 #ifdef HAVE_LCD_COLOR
     strb   r8,  [r1]
-    strb   r6,  [r1, #12]
-    strb   r12, [r1, #4]
-    strb   r14, [r1, #8]
+    strb   r6,  [r1, #9]
+    strb   r12, [r1, #3]
+    strb   r14, [r1, #6]
 #else
     strb   r8,  [r1]
     strb   r6,  [r1, #3]
@@ -647,13 +647,13 @@ jpeg_idct8h:
     mvnhi  r8,  r8,  asr #31
 #ifdef HAVE_LCD_COLOR
     strb   r8,  [r1]
-    strb   r8,  [r1, #4]
-    strb   r8,  [r1, #8]
+    strb   r8,  [r1, #3]
+    strb   r8,  [r1, #6]
+    strb   r8,  [r1, #9]
     strb   r8,  [r1, #12]
-    strb   r8,  [r1, #16]
-    strb   r8,  [r1, #20]
-    strb   r8,  [r1, #24]
-    strb   r8,  [r1, #28]
+    strb   r8,  [r1, #15]
+    strb   r8,  [r1, #18]
+    strb   r8,  [r1, #21]
 #else
     strb   r8,  [r1]
     strb   r8,  [r1, #1]
@@ -754,13 +754,13 @@ jpeg_idct8h:
     mvnhi  r14, r14, asr #31
 #ifdef HAVE_LCD_COLOR
     strb   r12, [r1]
-    strb   r4,  [r1, #4]
-    strb   r10, [r1, #8]
-    strb   r8,  [r1, #12]
-    strb   r9,  [r1, #16]
-    strb   r11, [r1, #20]
-    strb   r5,  [r1, #24]
-    strb   r14, [r1, #28]
+    strb   r4,  [r1, #3]
+    strb   r10, [r1, #6]
+    strb   r8,  [r1, #9]
+    strb   r9,  [r1, #12]
+    strb   r11, [r1, #15]
+    strb   r5,  [r1, #18]
+    strb   r14, [r1, #21]
 #else
     strb   r12, [r1]
     strb   r4,  [r1, #1]
@@ -781,13 +781,13 @@ jpeg_idct8h:
     mvnhi  r12, r12, asr #31
 #ifdef HAVE_LCD_COLOR
     strb   r12, [r1]
-    strb   r12, [r1, #4]
-    strb   r12, [r1, #8]
+    strb   r12, [r1, #3]
+    strb   r12, [r1, #6]
+    strb   r12, [r1, #9]
     strb   r12, [r1, #12]
-    strb   r12, [r1, #16]
-    strb   r12, [r1, #20]
-    strb   r12, [r1, #24]
-    strb   r12, [r1, #28]
+    strb   r12, [r1, #15]
+    strb   r12, [r1, #18]
+    strb   r12, [r1, #21]
 #else
     strb   r12, [r1]
     strb   r12, [r1, #1]
@@ -871,13 +871,13 @@ jpeg_idct8h:
     mvnhi  r11, r11, asr #31
 #ifdef HAVE_LCD_COLOR
     strb   r10, [r1]
-    strb   r12, [r1, #4]
-    strb   r8,  [r1, #8]
-    strb   r6,  [r1, #12]
-    strb   r7,  [r1, #16]
-    strb   r9,  [r1, #20]
-    strb   r14, [r1, #24]
-    strb   r11, [r1, #28]
+    strb   r12, [r1, #3]
+    strb   r8,  [r1, #6]
+    strb   r6,  [r1, #9]
+    strb   r7,  [r1, #12]
+    strb   r9,  [r1, #15]
+    strb   r14, [r1, #18]
+    strb   r11, [r1, #21]
 #else
     strb   r10, [r1]
     strb   r12, [r1, #1]
@@ -1011,13 +1011,13 @@ jpeg_idct8h:
     usat   r4,  #8,  r4,  asr #5
 #ifdef HAVE_LCD_COLOR
     strb   r4,  [r1]
-    strb   r4,  [r1, #4]
-    strb   r4,  [r1, #8]
+    strb   r4,  [r1, #3]
+    strb   r4,  [r1, #6]
+    strb   r4,  [r1, #9]
     strb   r4,  [r1, #12]
-    strb   r4,  [r1, #16]
-    strb   r4,  [r1, #20]
-    strb   r4,  [r1, #24]
-    strb   r4,  [r1, #28]
+    strb   r4,  [r1, #15]
+    strb   r4,  [r1, #18]
+    strb   r4,  [r1, #21]
 #else
     strb   r4,  [r1]
     strb   r4,  [r1, #1]
@@ -1085,13 +1085,13 @@ jpeg_idct8h:
     usat   r8,  #8,  r8,  asr #18
 #ifdef HAVE_LCD_COLOR
     strb   r6,  [r1]
-    strb   r4,  [r1, #4]
-    strb   r9,  [r1, #8]
-    strb   r14, [r1, #12]
-    strb   r12, [r1, #16]
-    strb   r10, [r1, #20]
-    strb   r7,  [r1, #24]
-    strb   r8,  [r1, #28]
+    strb   r4,  [r1, #3]
+    strb   r9,  [r1, #6]
+    strb   r14, [r1, #9]
+    strb   r12, [r1, #12]
+    strb   r10, [r1, #15]
+    strb   r7,  [r1, #18]
+    strb   r8,  [r1, #21]
 #else
     strb   r6,  [r1]
     strb   r4,  [r1, #1]
diff --git a/tools/configure b/tools/configure
index e543919..a839277 100755
--- a/tools/configure
+++ b/tools/configure
@@ -246,57 +246,48 @@ coldfirecc () {
 }
 
 arm7tdmicc () {
- prefixtools arm-elf-
+ prefixtools arm-elf-eabi-
  GCCOPTS="$CCOPTS -mcpu=arm7tdmi"
- if test "X$1" != "Xshort"; then
-   GCCOPTS="$GCCOPTS -mlong-calls"
- fi
  GCCOPTIMIZE="-fomit-frame-pointer"
  endian="little"
  gccchoice="4.0.3"
 }
 
 arm9tdmicc () {
- prefixtools arm-elf-
+ prefixtools arm-elf-eabi-
  GCCOPTS="$CCOPTS -mcpu=arm9tdmi"
- if test "$modelname" != "gigabeatf" -a "$t_manufacturer" != "as3525"; then
-  GCCOPTS="$GCCOPTS -mlong-calls"
- fi
  GCCOPTIMIZE="-fomit-frame-pointer"
  endian="little"
  gccchoice="4.0.3"
 }
 
 arm940tbecc () {
- prefixtools arm-elf-
- GCCOPTS="$CCOPTS -mbig-endian -mcpu=arm940t -mlong-calls"
+ prefixtools arm-elf-eabi-
+ GCCOPTS="$CCOPTS -mbig-endian -mcpu=arm940t"
  GCCOPTIMIZE="-fomit-frame-pointer"
  endian="big"
  gccchoice="4.0.3"
 }
 
 arm946cc () {
- prefixtools arm-elf-
- GCCOPTS="$CCOPTS -mcpu=arm9e -mlong-calls"
+ prefixtools arm-elf-eabi-
+ GCCOPTS="$CCOPTS -mcpu=arm946e-s"
  GCCOPTIMIZE="-fomit-frame-pointer"
  endian="little"
  gccchoice="4.0.3"
 }
 
 arm926ejscc () {
- prefixtools arm-elf-
- GCCOPTS="$CCOPTS -mcpu=arm926ej-s -mlong-calls"
+ prefixtools arm-elf-eabi-
+ GCCOPTS="$CCOPTS -mcpu=arm926ej-s"
  GCCOPTIMIZE="-fomit-frame-pointer"
  endian="little"
  gccchoice="4.0.3"
 }
 
 arm1136jfscc () {
- prefixtools arm-elf-
+ prefixtools arm-elf-eabi-
  GCCOPTS="$CCOPTS -mcpu=arm1136jf-s"
- if test "$modelname" != "gigabeats"; then
-  GCCOPTS="$GCCOPTS -mlong-calls"
- fi
  GCCOPTIMIZE="-fomit-frame-pointer"
  endian="little"
  gccchoice="4.0.3"
@@ -1082,7 +1073,7 @@ fi
     modelname="ifp7xx"
     target="-DIRIVER_IFP7XX"
     memory=1
-    arm7tdmicc short
+    arm7tdmicc
     tool="cp"
     bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
     bmp2rb_native="$rootdir/tools/bmp2rb -f 0"
diff --git a/tools/rockboxdev.sh b/tools/rockboxdev.sh
index 508b1ad..2c83b91 100755
--- a/tools/rockboxdev.sh
+++ b/tools/rockboxdev.sh
@@ -182,8 +182,11 @@ case $arch in
     esac
     ;;
   [Aa])
-    target="arm-elf"
-    gccpatch="rockbox-multilibs-arm-elf-gcc-4.0.3_2.diff"
+    target="arm-elf-eabi"
+    gccpatch="rockbox-fixes-multilib-gcc-4.3.3_1.diff"
+    gccconfigure="--disable-libssp --disable-lib-unwind-exceptions"
+    binutils="2.19.51"
+    gccver="4.3.3"
     ;;
   [Ii])
     target="mipsel-elf"
@@ -226,7 +229,12 @@ echo ""
 if test -f "$dlwhere/binutils-$binutils.tar.bz2"; then
   echo "binutils $binutils already downloaded"
 else
-  getfile binutils-$binutils.tar.bz2 $GNU_MIRROR/binutils
+  #check for snapshot release
+  if [ "${binutils##*.*.}" -gt 49 ] ; then
+    getfile binutils-$binutils.tar.bz2 'ftp://sourceware.org/pub/binutils/snapshots'
+  else
+    getfile binutils-$binutils.tar.bz2 $GNU_MIRROR/binutils
+  fi
 fi
 
 if test -f "$dlwhere/gcc-core-$gccver.tar.bz2"; then