diff -u -r dhcp3-3.0.2-orig/common/options.c dhcp3-3.0.2/common/options.c
--- dhcp3-3.0.2-orig/common/options.c	2004-12-04 11:03:18.000000000 +1100
+++ dhcp3-3.0.2/common/options.c	2006-02-07 22:02:14.000000000 +1100
@@ -947,17 +947,17 @@
 			((!six && !tix && (i == priority_len - 1) &&
 			  (bufix + 2 + length < bufend)) ||
 			 (bufix + 5 + length < bufend))) {
-			base = buffer;
+			base = (char *)buffer;
 			pix = &bufix;
 		    /* Try to fit it in the second buffer. */
 		    } else if (!splitup && first_cutoff &&
 			       (first_cutoff + six + 3 + length < sbufend)) {
-			base = &buffer[first_cutoff];
+			base = (char *)&buffer[first_cutoff];
 			pix = &six;
 		    /* Try to fit it in the third buffer. */
 		    } else if (!splitup && second_cutoff &&
 			       (second_cutoff + tix + 3 + length < buflen)) {
-			base = &buffer[second_cutoff];
+			base = (char *)&buffer[second_cutoff];
 			pix = &tix;
 		    /* Split the option up into the remaining space. */
 		    } else {
@@ -966,19 +966,19 @@
 			/* Use any remaining options space. */
 			if (bufix + 6 < bufend) {
 			    incr = bufend - bufix - 5;
-			    base = buffer;
+			    base = (char *)buffer;
 			    pix = &bufix;
 			/* Use any remaining first_cutoff space. */
 			} else if (first_cutoff &&
 				   (first_cutoff + six + 4 < sbufend)) {
 			    incr = sbufend - (first_cutoff + six) - 3;
-			    base = &buffer[first_cutoff];
+			    base = (char *)&buffer[first_cutoff];
 			    pix = &six;
 			/* Use any remaining second_cutoff space. */
 			} else if (second_cutoff &&
 				   (second_cutoff + tix + 4 < buflen)) {
 			    incr = buflen - (second_cutoff + tix) - 3;
-			    base = &buffer[second_cutoff];
+			    base = (char *)&buffer[second_cutoff];
 			    pix = &tix;
 			/* Give up, roll back this option. */
 			} else {
diff -u -r dhcp3-3.0.2-orig/debian/patches/add-libdst.a-dhcp3-dev.dpatch dhcp3-3.0.2/debian/patches/add-libdst.a-dhcp3-dev.dpatch
--- dhcp3-3.0.2-orig/debian/patches/add-libdst.a-dhcp3-dev.dpatch	2006-02-07 22:23:19.000000000 +1100
+++ dhcp3-3.0.2/debian/patches/add-libdst.a-dhcp3-dev.dpatch	2006-02-07 21:25:27.000000000 +1100
@@ -15,7 +15,7 @@
 -install:
 -
  libdst.a:	$(OBJ)
- 	rm -f dst.a
+ 	rm -f libdst.a
  	ar cruv libdst.a $(OBJ)
  	$(RANLIB) libdst.a
  
diff -u -r dhcp3-3.0.2-orig/dst/Makefile.dist dhcp3-3.0.2/dst/Makefile.dist
--- dhcp3-3.0.2-orig/dst/Makefile.dist	2004-06-11 03:59:28.000000000 +1000
+++ dhcp3-3.0.2/dst/Makefile.dist	2006-02-07 21:24:49.000000000 +1100
@@ -33,7 +33,7 @@
 install:
 
 libdst.a:	$(OBJ)
-	rm -f dst.a
+	rm -f libdst.a
 	ar cruv libdst.a $(OBJ)
 	$(RANLIB) libdst.a
 
diff -u -r dhcp3-3.0.2-orig/includes/dhcpd.h dhcp3-3.0.2/includes/dhcpd.h
--- dhcp3-3.0.2-orig/includes/dhcpd.h	2004-11-25 04:39:16.000000000 +1100
+++ dhcp3-3.0.2/includes/dhcpd.h	2006-02-07 22:05:46.000000000 +1100
@@ -306,9 +306,9 @@
 #	define EPHEMERAL_FLAGS		(MS_NULL_TERMINATION | \
 					 UNICAST_BROADCAST_HACK)
 
-	binding_state_t __attribute__ ((mode (__byte__))) binding_state;
-	binding_state_t __attribute__ ((mode (__byte__))) next_binding_state;
-	binding_state_t __attribute__ ((mode (__byte__))) desired_binding_state;
+	binding_state_t binding_state;
+	binding_state_t next_binding_state;
+	binding_state_t desired_binding_state;
 	
 	struct lease_state *state;
 
diff -u -r dhcp3-3.0.2-orig/minires/Makefile.dist dhcp3-3.0.2/minires/Makefile.dist
--- dhcp3-3.0.2-orig/minires/Makefile.dist	2004-06-11 03:59:40.000000000 +1000
+++ dhcp3-3.0.2/minires/Makefile.dist	2006-02-07 21:25:04.000000000 +1100
@@ -39,7 +39,7 @@
 install:
 
 libres.a:	$(OBJ)
-	rm -f res.a
+	rm -f libres.a
 	ar cruv libres.a $(OBJ)
 	$(RANLIB) libres.a
 
The End