diff --git a/Build/AtlasBuildScripts/build_Gaudi.sh b/Build/AtlasBuildScripts/build_Gaudi.sh
index cae26318903d6a2abbc28b854d75f9dc72bef8fd..6576d026f2359db391c82488b4db2e76df4f1c4e 100755
--- a/Build/AtlasBuildScripts/build_Gaudi.sh
+++ b/Build/AtlasBuildScripts/build_Gaudi.sh
@@ -126,6 +126,9 @@ fi
 error_stamp=`mktemp .tmp.error.XXXXX` ; rm -f $error_stamp
 {
 cpack || touch $error_stamp
+if [ "$BUILDTYPE" = "RelWithDebInfo" ]; then
+    cpack --config CPackDbgRPMConfig.cmake || touch $error_stamp
+fi
 } 2>&1 | tee cmake_cpack.log
 test -f $error_stamp && ((ERROR_COUNT++))
 rm -f $error_stamp
diff --git a/Projects/Athena/build.sh b/Projects/Athena/build.sh
index b0ca09166a45b3ffc56dd48c2bc8efe1055ccd5d..6de0a809a4a62de5315850493262bfc20a07ebea 100755
--- a/Projects/Athena/build.sh
+++ b/Projects/Athena/build.sh
@@ -178,6 +178,9 @@ fi
 # Build an RPM for the release:
 if [ -n "$EXE_CPACK" ]; then
     { time cpack; } 2>&1 | tee cmake_cpack.log
+    if [ "$BUILDTYPE" = "RelWithDebInfo" ]; then
+	{ time cpack --config CPackDbgRPMConfig.cmake; } 2>&1 | tee -a cmake_cpack.log
+    fi
     cp Athena*.rpm ${BUILDDIR}/
 fi