2 files changed, 6 insertions, 4 deletions

diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 6365748956..e67fb749fe 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -177,10 +177,12 @@ runstrip() {
                         ro=1
                         chmod +w "$1"
                 }
-                '${OBJCOPY}' --only-keep-debug "$1" "$1.dbg"
+                mkdir $(dirname "$1")/.debug
+                debugfile="$(dirname "$1")/.debug/$(basename "$1")"
+                '${OBJCOPY}' --only-keep-debug "$1" "$debugfile"
                 '${STRIP}' "$1"
                 st=$?
-                '${OBJCOPY}' --add-gnu-debuglink="$1.dbg" "$1"
+                '${OBJCOPY}' --add-gnu-debuglink="$debugfile" "$1"
                 test -n "$ro" && chmod -w "$1"
                 if test $st -ne 0
                 then
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 6c15ef71b4..759f1381ec 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -118,8 +118,8 @@ FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \
                 ${libdir}/*.a ${libdir}/*.o ${libdir}/pkgconfig \
                 /lib/*.a /lib/*.o ${datadir}/aclocal"
 FILES_${PN}-locale = "${datadir}/locale"
-FILES_${PN}-dbg = "${bindir}/*.dbg ${sbindir}/*.dbg ${libexecdir}/*.dbg ${libdir}/lib*.so.*.dbg \
-            /bin/*.dbg /sbin/*.dbg /lib/*.so*.dbg ${libdir}/${PN}/*.dbg"
+FILES_${PN}-dbg = "${bindir}/.debug ${sbindir}/.debug ${libexecdir}/.debug ${libdir}/.debug \
+            /bin/.debug /sbin/.debug /lib/.debug ${libdir}/${PN}/.debug"
 
 # File manifest