diff -urN mkelfImage-2.5.orig/linux-i386/mkelf-linux-i386.c mkelfImage-2.5/linux-i386/mkelf-linux-i386.c
--- mkelfImage-2.5.orig/linux-i386/mkelf-linux-i386.c	2003-01-25 00:48:03 +0200
+++ mkelfImage-2.5/linux-i386/mkelf-linux-i386.c	2008-08-10 22:51:24 +0300
@@ -276,7 +276,7 @@
 	ehdr->e_machine = EM_386;
 
 	/* locate the payload buffer */
-	payload_buf = payload;
+	payload_buf = (char*)payload;
 	payload_size = sizeof(payload);
 
 	/* slurp the input files */
@@ -295,7 +295,7 @@
 	}
 
 	/* Copy the command line */
-	strncpy(params->cmdline, cmdline, sizeof(params->cmdline));
+	strncpy((char*)params->cmdline, cmdline, sizeof(params->cmdline));
 	params->cmdline[sizeof(params->cmdline)-1]= '\0';
 
 	
diff -urN mkelfImage-2.5.orig/linux-ia64/mkelf-linux-ia64.c mkelfImage-2.5/linux-ia64/mkelf-linux-ia64.c
--- mkelfImage-2.5.orig/linux-ia64/mkelf-linux-ia64.c	2003-01-25 00:48:03 +0200
+++ mkelfImage-2.5/linux-ia64/mkelf-linux-ia64.c	2008-08-10 22:52:03 +0300
@@ -194,7 +194,7 @@
 	ehdr->e_machine = EM_IA_64;
 	
 	/* locate the payload buffer */
-	payload_buf = payload;
+	payload_buf = (char*)payload;
 	payload_size = sizeof(payload);
 
 	/* slurp the input files */
@@ -213,7 +213,7 @@
 	}
 
 	/* Copy the command line */
-	strncpy(params->cmdline, cmdline, sizeof(params->cmdline));
+	strncpy((char*)params->cmdline, cmdline, sizeof(params->cmdline));
 	params->cmdline[sizeof(params->cmdline)-1]= '\0';
 
 	/* Add a program header for the note section */
diff -urN mkelfImage-2.5.orig/Makefile mkelfImage-2.5/Makefile
--- mkelfImage-2.5.orig/Makefile	2003-04-24 21:48:34 +0300
+++ mkelfImage-2.5/Makefile	2008-08-10 22:53:17 +0300
@@ -16,7 +16,7 @@
 
 CPPFLAGS=-DVERSION='"$(VERSION)"' -DRELEASE_DATE='"$(RELEASE_DATE)"' -I include
 HOST_CPPFLAGS=$(CPPFLAGS)
-I386_CPPFLAGS=$(CPPFLAGS) -I arch/i386/include
+I386_CPPFLAGS=$(CPPFLAGS) -fno-stack-protector -I arch/i386/include
 IA64_CPPFLAGS=$(CPPFLAGS) -I arch/ia64/include
 
 GENERATED_SRCS:=\