diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index a6b769820669..8add378c44aa 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -628,7 +628,9 @@ OLD_FILES+=usr/lib/libpam_ssh.a
 OLD_FILES+=usr/lib/libpam_ssh_p.a
 OLD_FILES+=usr/bin/help
 OLD_FILES+=usr/bin/sccs
+.if ${TARGET_ARCH} != "i386"
 OLD_FILES+=usr/bin/gdbserver
+.endif
 OLD_FILES+=usr/bin/ssh-keysign
 OLD_FILES+=usr/sbin/gifconfig
 OLD_FILES+=usr/sbin/prefix