diff --git a/tools/mkexport.sh b/tools/mkexport.sh
index 348a14cf5c..06c42f24e8 100755
--- a/tools/mkexport.sh
+++ b/tools/mkexport.sh
@@ -235,6 +235,12 @@ else
 	echo "ARCHCXXFLAGS = ${ARCHCXXFLAGS}" >>"${EXPORTDIR}/build/Make.defs"
 fi
 
+# Copy the system map file
+
+if [ -r ${TOPDIR}/System.map ]; then
+	cp -a "${TOPDIR}/System.map" "${EXPORTDIR}/."
+fi
+
 # Copy the NuttX include directory (retaining attributes and following symbolic links)
 
 cp -LR -p "${TOPDIR}/include" "${EXPORTDIR}/." || \