diff --git a/ChangeLog b/ChangeLog
index 0d44830..13ab949 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 2006-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  21 Jun 2007; Chris Gianelloni <wolf31o2@gentoo.org> gen_package.sh:
+  Added a patch from Andrew Gaffney <agaffney@gentoo.org> from bug #174188 to
+  fix a problem with the System.map file copying that was previously
+  introduced.
+
   21 Jun 2007; Chris Gianelloni <wolf31o2@gentoo.org> genkernel.8:
   Added patch from Nelson Batalha <nelson_batalha@hotmail.com> from bug
   #172766 to add documentation for genkernel's LUKS features.
diff --git a/gen_package.sh b/gen_package.sh
index b2cec34..323bb7c 100644
--- a/gen_package.sh
+++ b/gen_package.sh
@@ -34,7 +34,12 @@ gen_minkernpackage()
 	    fi
 	fi
 
-	cp "${TMPDIR}/System.map-${KV}" "${TEMP}/minkernpackage/System.map-${ARCH}-${KV}" || gen_die 'Could not copy System.map for the kernel package!';
+	if [ "${CMD_KERNCACHE}" != "" ]
+	then
+	    /bin/tar -xj -C ${TEMP}/minkernpackage -f ${CMD_KERNCACHE} System.map-${ARCH}-${KV}
+	else
+		cp "${KERNEL_DIR}/System.map" "${TEMP}/minkernpackage/System.map-${ARCH}-${KV}" || gen_die 'Could not copy System.map for the kernel package!';
+	fi
 	
 	cd "${TEMP}/minkernpackage" 
 	/bin/tar -jcpf ${MINKERNPACKAGE} * || gen_die 'Could not compress the kernel package!'