diff --git a/ChangeLog b/ChangeLog
index b94786e..cb8ad96 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2016-04-07  Ola Jeppsson  <ola@adapteva.com>
+
+	* build-epiphany-sdk.sh (CFLAGS): Strip/replace source path to somewhat
+	improve debug situation.
+	(CXXFLAGS): Likewise.
+
 2016-03-27  Ola Jeppsson  <ola@adapteva.com>
 
 	* components.conf: Use epiphany-libs 2016.3
diff --git a/build-epiphany-sdk.sh b/build-epiphany-sdk.sh
index fd0eb5e..c41af2e 100755
--- a/build-epiphany-sdk.sh
+++ b/build-epiphany-sdk.sh
@@ -203,6 +203,9 @@ else
 	sdk_debug_str=""
 fi
 
+export CFLAGS="-fdebug-prefix-map=${basedir}=${ESDK}/src ${CFLAGS}"
+export CXXLAGS="-fdebug-prefix-map=${basedir}=${ESDK}/src ${CXXFLAGS}"
+
 if [ "xyes" = "x$CLEAN" ]; then
 	toolchain_clean_str="--clean-build --clean-host"
 	sdk_clean_str="--clean"