diff -ru WRT54G.orig/src/router/rc/writeimage.c WRT54G/src/router/rc/writeimage.c
--- WRT54G.orig/src/router/rc/writeimage.c	2004-09-20 01:36:58.000000000 -0400
+++ WRT54G/src/router/rc/writeimage.c	2004-09-20 01:41:24.000000000 -0400
@@ -50,9 +50,9 @@
 #define ROUNDUP(x, y) ((((unsigned int)(x)+((y)-1))/(y))*(y))
 #define OFFSET(p, field) ((unsigned int)(&((p)->field)) - (unsigned int)(p))
 #define MIN(a, b) \
-({ typedef _ta = (a), _tb = (b); \
-   _ta _a = (a); _tb _b = (b); \
-   _a < _b ? _a : _b; \
+({ __typeof__ (a) _ta = a; \
+   __typeof__ (b) _tb = b; \
+   _ta < _tb ? _ta : _tb; \
 })
 
 extern int mtd_erase_sector(const char *mtd, unsigned long start, unsigned long end);
diff -ru WRT54G.orig/src/router/zebra/Makefile WRT54G/src/router/zebra/Makefile
--- WRT54G.orig/src/router/zebra/Makefile	2004-09-20 01:36:59.000000000 -0400
+++ WRT54G/src/router/zebra/Makefile	2004-09-20 01:52:37.000000000 -0400
@@ -59,10 +59,10 @@
 POST_UNINSTALL = :
 host_alias = i686-pc-linux-gnu
 host_triplet = i686-pc-linux-gnu
-AR = ar
+#AR = ar
 BGPD = 
-CC = gcc
-CPP = gcc -E
+#CC = gcc
+#CPP = gcc -E
 CURSES = 
 IF_METHOD = if_netlink.o
 IF_PROC = if_proc.o
@@ -78,7 +78,7 @@
 OSPFD = 
 OTHER_METHOD = 
 PACKAGE = zebra
-RANLIB = ranlib
+#RANLIB = ranlib
 RIPD = ripd
 RIPNGD = 
 RTREAD_METHOD = rtread_netlink.o
diff -ru WRT54G.orig/src/router/zebra/lib/Makefile WRT54G/src/router/zebra/lib/Makefile
--- WRT54G.orig/src/router/zebra/lib/Makefile	2004-09-20 01:36:59.000000000 -0400
+++ WRT54G/src/router/zebra/lib/Makefile	2004-09-20 01:53:19.000000000 -0400
@@ -59,10 +59,10 @@
 POST_UNINSTALL = :
 host_alias = i686-pc-linux-gnu
 host_triplet = i686-pc-linux-gnu
-AR = ar
+#AR = ar
 BGPD = 
-CC = gcc
-CPP = gcc -E
+#CC = gcc
+#CPP = gcc -E
 CURSES = 
 IF_METHOD = if_netlink.o
 IF_PROC = if_proc.o
@@ -77,7 +77,7 @@
 OSPFD = 
 OTHER_METHOD = 
 PACKAGE = zebra
-RANLIB = ranlib
+#RANLIB = ranlib
 RIPD = ripd
 RIPNGD = 
 RTREAD_METHOD = rtread_netlink.o
diff -ru WRT54G.orig/src/router/zebra/ospfd/Makefile WRT54G/src/router/zebra/ospfd/Makefile
--- WRT54G.orig/src/router/zebra/ospfd/Makefile	2004-09-20 01:37:02.000000000 -0400
+++ WRT54G/src/router/zebra/ospfd/Makefile	2004-09-20 01:56:13.000000000 -0400
@@ -59,10 +59,10 @@
 POST_UNINSTALL = :
 host_alias = i686-pc-linux-gnu
 host_triplet = i686-pc-linux-gnu
-AR = ar
+#AR = ar
 BGPD = 
-CC = gcc
-CPP = gcc -E
+#CC = gcc
+#CPP = gcc -E
 CURSES = 
 IF_METHOD = if_netlink.o
 IF_PROC = if_proc.o
@@ -77,7 +77,7 @@
 OSPFD = 
 OTHER_METHOD = 
 PACKAGE = zebra
-RANLIB = ranlib
+#RANLIB = ranlib
 RIPD = ripd
 RIPNGD = 
 RTREAD_METHOD = rtread_netlink.o
diff -ru WRT54G.orig/src/router/zebra/ripd/Makefile WRT54G/src/router/zebra/ripd/Makefile
--- WRT54G.orig/src/router/zebra/ripd/Makefile	2004-09-20 01:37:02.000000000 -0400
+++ WRT54G/src/router/zebra/ripd/Makefile	2004-09-20 01:56:51.000000000 -0400
@@ -59,10 +59,10 @@
 POST_UNINSTALL = :
 host_alias = i686-pc-linux-gnu
 host_triplet = i686-pc-linux-gnu
-AR = ar
+#AR = ar
 BGPD = 
-CC = gcc
-CPP = gcc -E
+#CC = gcc
+#CPP = gcc -E
 CURSES = 
 IF_METHOD = if_netlink.o
 IF_PROC = if_proc.o
@@ -77,7 +77,7 @@
 OSPFD = 
 OTHER_METHOD = 
 PACKAGE = zebra
-RANLIB = ranlib
+#RANLIB = ranlib
 RIPD = ripd
 RIPNGD = 
 RTREAD_METHOD = rtread_netlink.o
diff -ru WRT54G.orig/src/router/zebra/zebra/Makefile WRT54G/src/router/zebra/zebra/Makefile
--- WRT54G.orig/src/router/zebra/zebra/Makefile	2004-09-20 01:37:02.000000000 -0400
+++ WRT54G/src/router/zebra/zebra/Makefile	2004-09-20 01:55:45.000000000 -0400
@@ -59,10 +59,10 @@
 POST_UNINSTALL = :
 host_alias = i686-pc-linux-gnu
 host_triplet = i686-pc-linux-gnu
-AR = ar
+#AR = ar
 BGPD = 
-CC = gcc
-CPP = gcc -E
+#CC = gcc
+#CPP = gcc -E
 CURSES = 
 IF_METHOD = if_netlink.o
 IF_PROC = if_proc.o
@@ -76,7 +76,7 @@
 OSPFD = 
 OTHER_METHOD = 
 PACKAGE = zebra
-RANLIB = ranlib
+#RANLIB = ranlib
 RIPD = ripd
 RIPNGD = 
 RTREAD_METHOD = rtread_netlink.o