diff --git a/Makefile b/Makefile
index 63a4877..7ed2ea6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,11 @@
 # Makefile for EOL
 
-AS=arm-linux-as
-CC=arm-linux-gcc
-LD=arm-linux-ld
-OBJCOPY=arm-linux-objcopy
-OBJDUMP=arm-linux-objdump
+CROSS_COMPILE=/home/ph5/src/oe/build/angstrom/cross/bin/arm-angstrom-linux-gnueabi-
+AS=$(CROSS_COMPILE)as
+CC=$(CROSS_COMPILE)gcc
+LD=$(CROSS_COMPILE)ld
+OBJCOPY=$(CROSS_COMPILE)objcopy
+OBJDUMP=$(CROSS_COMPILE)objdump
 
 CFLAGS=-march=armv5te -mtune=arm9tdmi -Wall -O2 -fpack-struct
 
@@ -17,10 +18,8 @@ CFLAGS=-march=armv5te -mtune=arm9tdmi -Wall -O2 -fpack-struct
 # readers don't know how to read the id unfortunately). The first byte of the
 # id needs to be set to zero.
 
-MODEL=typhoon
-#MODEL=tornado
-CARDID=004a0015ea8e00553631304453445303 # my miniSD, won't be of any use to you
-#CARDID=005c00c702000000424732445343542b
+MODEL=herald
+CARDID=006c0006145d70803832315553445303 # pH5's 128MB microSD from neo
 
 # Address where the bootloader is relocated and run.
 TEXTADDR=0x8d000000
diff --git a/typhoonnbfdecode.pl b/typhoonnbfdecode.pl
index 1f794b1..6de8318 100755
--- a/typhoonnbfdecode.pl
+++ b/typhoonnbfdecode.pl
@@ -101,6 +101,11 @@ our %deskeys= (
         pack("C*", map { $_-0x60 } ( 0x91, 0xB6, 0xC7, 0x8A, 0xA0, 0x99, 0x83, 0x8C )),
         pack("C*", map { $_-0x60 } ( 0x83, 0x83, 0x98, 0x90, 0xA7, 0xD0, 0xBB, 0xDB )),
     ],
+    herald=>[
+        pack("C*", map { $_-0x60 } ( 0xC1, 0xAE, 0xD2, 0xA5, 0xA8, 0xD4, 0xB2, 0xD6 )),
+        pack("C*", map { $_-0x60 } ( 0xB4, 0xCF, 0xA5, 0xD2, 0xB3, 0xA1, 0xC5, 0xAF )),
+        pack("C*", map { $_-0x60 } ( 0xA0, 0xAD, 0xC4, 0xA3, 0xD3, 0xC5, 0xA8, 0xA9 )),
+    ],
     typhoon=>[
         pack("C*", map { $_-0x60 } ( 0xBE, 0xC8, 0x88, 0xAB, 0xCF, 0xA0, 0x90, 0x81 )),
         pack("C*", map { $_-0x60 } ( 0x94, 0xA2, 0xC5, 0x8B, 0x97, 0xA7, 0x88, 0xB1 )),