diff --git a/include/configs/aspenite.h b/include/configs/aspenite.h
index 727b14a6c2..47760ef7ba 100644
--- a/include/configs/aspenite.h
+++ b/include/configs/aspenite.h
@@ -10,6 +10,11 @@
 #ifndef __CONFIG_ASPENITE_H
 #define __CONFIG_ASPENITE_H
 
+/*
+ * Generic board support
+ */
+#define CONFIG_SYS_GENERIC_BOARD
+
 /*
  * Version number information
  */
diff --git a/include/configs/dreamplug.h b/include/configs/dreamplug.h
index 981233a070..ea6e5c0329 100644
--- a/include/configs/dreamplug.h
+++ b/include/configs/dreamplug.h
@@ -37,6 +37,10 @@
 #define CONFIG_KW88F6281	1	/* SOC Name */
 #define CONFIG_MACH_TYPE	MACH_TYPE_DREAMPLUG
 #define CONFIG_SKIP_LOWLEVEL_INIT	/* disable board lowlevel_init */
+#define CONFIG_SYS_GENERIC_BOARD
+
+/* Add target to build it automatically upon "make" */
+#define CONFIG_BUILD_TARGET     "u-boot.kwb"
 
 /*
  * Commands configuration
diff --git a/include/configs/gplugd.h b/include/configs/gplugd.h
index 404c56af10..0ac198df8d 100644
--- a/include/configs/gplugd.h
+++ b/include/configs/gplugd.h
@@ -25,6 +25,11 @@
 #define MACH_TYPE_SHEEVAD	2625
 #endif
 
+/*
+ * Generic board support
+ */
+#define CONFIG_SYS_GENERIC_BOARD
+
 /*
  * Version number information
  */
diff --git a/tools/kwbimage.c b/tools/kwbimage.c
index de5c80847e..9540e7eb84 100644
--- a/tools/kwbimage.c
+++ b/tools/kwbimage.c
@@ -498,6 +498,7 @@ static void *image_create_v1(size_t *imagesz, struct image_tool_params *params,
 		binhdrsz = sizeof(struct opt_hdr_v1) +
 			(binarye->binary.nargs + 1) * sizeof(unsigned int) +
 			s.st_size;
+		binhdrsz = ALIGN_SUP(binhdrsz, 32);
 		hdr->headersz_lsb = binhdrsz & 0xFFFF;
 		hdr->headersz_msb = (binhdrsz & 0xFFFF0000) >> 16;