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