diff --git a/devel/i386-rtems-gdb/Makefile b/devel/i386-rtems-gdb/Makefile
index 4a52e955c67e..66a99ff528de 100644
--- a/devel/i386-rtems-gdb/Makefile
+++ b/devel/i386-rtems-gdb/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gdb
 PORTVERSION=	5.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	gdb
@@ -21,6 +21,8 @@ PATCHFILES=	${GDBNAME}-rtems-base-20020612.diff \
 PATCH_SITES=	ftp://ftp.rtems.com/pub/rtems/snapshots/c_tools/source/ \
 		http://rtems.thehousleys.net/
 
+.include <bsd.port.pre.mk>
+
 LCLTARGET?=	i386-rtems
 
 GDBNAME=	gdb-5.2
@@ -51,6 +53,17 @@ PATCHFILES+=	powerpc-gdb-5.2-hw_sem.c.diff:THN \
 PATCH_SITES+=	http://rtems.thehousleys.net/:THN
 .endif
 
+.if ${LCLTARGET} == sparc-rtems
+.if (${OSVERSION} >= 502000)
+CONFIGURE_ARGS+=	--verbose --disable-sim
+PLIST_SUB+=		SPARC_NOSIM='@comment '
+.else
+CONFIGURE_ARGS+=	--verbose --enable-sim
+PLIST_SUB+=		SPARC_NOSIM=''
+MAN1=		${LCLTARGET}-run.1
+.endif
+.endif
+
 MAN1+=		${LCLTARGET}-gdb.1
 
 pre-configure:
@@ -64,4 +77,4 @@ do-install:
 	@(cd ${WRKDIR}/build-${LCLTARGET} && \
 	${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/devel/i386-rtems-gdb/pkg-plist.sparc-rtems b/devel/i386-rtems-gdb/pkg-plist.sparc-rtems
index 0ae6820e3526..49c66bc7e7f2 100644
--- a/devel/i386-rtems-gdb/pkg-plist.sparc-rtems
+++ b/devel/i386-rtems-gdb/pkg-plist.sparc-rtems
@@ -1,4 +1,4 @@
 bin/sparc-rtems-gdb
-bin/sparc-rtems-run
-bin/sparc-rtems-sis
-lib/libsparc-rtems-sim.a
+%%SPARC_NOSIM%%bin/sparc-rtems-run
+%%SPARC_NOSIM%%bin/sparc-rtems-sis
+%%SPARC_NOSIM%%lib/libsparc-rtems-sim.a
diff --git a/devel/sparc-rtems-gdb/Makefile b/devel/sparc-rtems-gdb/Makefile
index b719c6f1b662..ec85e378e822 100644
--- a/devel/sparc-rtems-gdb/Makefile
+++ b/devel/sparc-rtems-gdb/Makefile
@@ -10,8 +10,5 @@ PORTNAME=	gdb
 MAINTAINER=	jeh@FreeBSD.org
 
 LCLTARGET=	sparc-rtems
-CONFIGURE_ARGS+=	--verbose --enable-sim
-
-MAN1=		${LCLTARGET}-run.1
 
 .include "${.CURDIR}/../i386-rtems-gdb/Makefile"