Problem compiling a new bootloader with WDT

Hi there,

I would like to use the watch dog timer WDT on a Duemilanova using the atmega328. I have done this for the Mega, with little or no problem. The thing is that I can not compile the ATmegaBOOT_168_atmega328.hex with or without the -DWATCHDOG_MODS compile switch. With no modification to the Makefile or the ATmegaBOOT_168.c file from a fresh install of Arduino 21 I get the error:
$ make atmega328
avr-gcc -g -Wall -O2 -mmcu=atmega328p -DF_CPU=16000000L '-DMAX_TIME_COUNT=F_CPU>>4' '-DNUM_LED_FLASHES=1' -DBAUD_RATE=57600 -c -o ATmegaBOOT_168.o ATmegaBOOT_168.c
ATmegaBOOT_168.c: In function 'main':
ATmegaBOOT_168.c:586:101: error: 'EEWE' undeclared (first use in this function)
ATmegaBOOT_168.c:586:101: note: each undeclared identifier is reported only once for each function it appears in
make: *** [ATmegaBOOT_168.o] Error 1

I have looked at the forum post:
num=1260104386
and the bug report mentioned there in
(note I cannot include links as this is my first post)
The suggestion on the google page causes an error when uploading the bootloader. Leaves the atmega328 in a unusable state requiring the arduino 21 package to be re-downloaded so as to can a working bootloader. The bootloader that comes with the arduino 21 (and 18) work just fine, just can't compile a new one (I have tried 21 and 18).

I appreciate any help you can offer me.
Tim.