diff --git a/minix/drivers/net/rtl8169/rtl8169.c b/minix/drivers/net/rtl8169/rtl8169.c
index 47c7bcab9..f74855f54 100644
--- a/minix/drivers/net/rtl8169/rtl8169.c
+++ b/minix/drivers/net/rtl8169/rtl8169.c
@@ -752,6 +752,9 @@ static void rl_reset_hw(re_t *rep)
 	case RL_TCR_HWVER_RTL8105E:
 		rep->re_model = "RTL8105E";
 		break;
+        case RL_TCR_HWVER_RTL8111GS_CG:
+                rep->re_model = "RTL8111GS-GC";
+                break;
 	default:
 		rep->re_model = "Unknown";
 		rep->re_mac = t;
diff --git a/minix/drivers/net/rtl8169/rtl8169.h b/minix/drivers/net/rtl8169/rtl8169.h
index 9fd7580f0..3a0690993 100644
--- a/minix/drivers/net/rtl8169/rtl8169.h
+++ b/minix/drivers/net/rtl8169/rtl8169.h
@@ -112,6 +112,7 @@
 #define			RL_TCR_HWVER_RTL8169	0x00000000 /* RTL8169 */
 #define			RL_TCR_HWVER_RTL8169S	0x00800000 /* RTL8169S */
 #define			RL_TCR_HWVER_RTL8110S	0x04000000 /* RTL8110S */
+#define			RL_TCR_HWVER_RTL8111GS_CG	0x4C000000 /* RTL8111GS-CG */
 #define			RL_TCR_HWVER_RTL8169SB	0x10000000 /* RTL8169sb/8110sb */
 #define			RL_TCR_HWVER_RTL8110SCd	0x18000000 /* RTL8169sc/8110sc */
 #define			RL_TCR_HWVER_RTL8105E	0x40800000 /* RTL8105E */
diff --git a/releasetools/x86_hdimage.sh b/releasetools/x86_hdimage.sh
index 58c758886..4472a963f 100755
--- a/releasetools/x86_hdimage.sh
+++ b/releasetools/x86_hdimage.sh
@@ -26,6 +26,7 @@ fi
 : ${ROOT_SIZE=$((  128*(2**20) - ${BOOTXX_SECS} * 512 ))}
 : ${HOME_SIZE=$((  128*(2**20) ))}
 : ${USR_SIZE=$((  1792*(2**20) ))}
+: ${EFI_SIZE=$((  0  ))}
 
 # set up disk creation environment
 . releasetools/image.defaults
@@ -93,14 +94,23 @@ echo " * HOME"
 _HOME_SIZE=$(${CROSS_TOOLS}/nbmkfs.mfs -d ${HOMESIZEARG} -I $((${HOME_START}*512)) ${IMG} ${WORK_DIR}/proto.home)
 _HOME_SIZE=$(($_HOME_SIZE / 512))
 
-#
-# Write the partition table using the natively compiled
-# minix partition utility
-#
-${CROSS_TOOLS}/nbpartition -m ${IMG} ${BOOTXX_SECS} 81:${_ROOT_SIZE} 81:${_USR_SIZE} 81:${_HOME_SIZE}
+if [ ${EFI_SIZE} -ge 512 ]
+then
+	echo " * EFI"
+	dd if=/dev/zero bs=${EFI_SIZE} count=1 >> ${IMG} 
+	# Write the partition table using the natively compiled
+	# minix partition utility
+	${CROSS_TOOLS}/nbpartition -m ${IMG} ${BOOTXX_SECS} 81:${_ROOT_SIZE}* 81:${_USR_SIZE} 81:${_HOME_SIZE} EF:1+
+else
+	# Write the partition table using the natively compiled
+	# minix partition utility
+	${CROSS_TOOLS}/nbpartition -m ${IMG} ${BOOTXX_SECS} 81:${_ROOT_SIZE}* 81:${_USR_SIZE} 81:${_HOME_SIZE}
+fi
+
 ${CROSS_TOOLS}/nbinstallboot -f -m ${ARCH} ${IMG} ${DESTDIR}/usr/mdec/bootxx_minixfs3
 
 echo ""
+mods="`( cd ${MODDIR}; echo mod* | tr ' ' ',' )`"
 echo "Disk image at `pwd`/${IMG}"
 echo ""
 echo "To boot this image on kvm using the bootloader:"