diff --git a/devel/gdb/Makefile b/devel/gdb/Makefile
index 937e92954251..a849595929dc 100644
--- a/devel/gdb/Makefile
+++ b/devel/gdb/Makefile
@@ -8,8 +8,9 @@
 
 PORTNAME=	gdb
 PORTVERSION=	7.3.1
+PORTREVISION=	1
 CATEGORIES=	devel
-MASTER_SITES=   ${MASTER_SITE_GNU:S,$,:gdb,}
+MASTER_SITES=	${MASTER_SITE_GNU:S,$,:gdb,}
 MASTER_SITE_SUBDIR=gdb/:gdb
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:gdb
 
@@ -57,15 +58,15 @@ CFLAGS+=	-g
 
 .if defined(WITH_EXPAT)
 LIB_DEPENDS+=	expat.6:${PORTSDIR}/textproc/expat2
-CONFIGURE_ARGS+= --with-expat=yes
+CONFIGURE_ARGS+=	--with-expat=yes
 .else
-CONFIGURE_ARGS+= --without-expat
+CONFIGURE_ARGS+=	--without-expat
 .endif
 
 .if defined(WITH_PYTHON)
-CONFIGURE_ARGS+= --with-python=${PYTHON_CMD}
+CONFIGURE_ARGS+=	--with-python=${PYTHON_CMD}
 .else
-CONFIGURE_ARGS+= --without-python
+CONFIGURE_ARGS+=	--without-python
 .endif
 
 # XXX: add OSVERSION check after readline is removed from base
diff --git a/devel/gdb/files/fbsd-threads.c b/devel/gdb/files/fbsd-threads.c
index 8331b38b963f..db06e774dc2e 100644
--- a/devel/gdb/files/fbsd-threads.c
+++ b/devel/gdb/files/fbsd-threads.c
@@ -1,4 +1,4 @@
-/* $FreeBSD: /tmp/pcvs/ports/devel/gdb/files/fbsd-threads.c,v 1.1 2010-11-16 20:39:48 skreuzer Exp $ */
+/* $FreeBSD: /tmp/pcvs/ports/devel/gdb/files/fbsd-threads.c,v 1.2 2011-11-06 18:12:32 ohauer Exp $ */
 /* FreeBSD libthread_db assisted debugging support.
    Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
 
@@ -358,8 +358,11 @@ enable_thread_event_reporting (void)
 
   /* Set the process wide mask saying which events we're interested in.  */
   td_event_emptyset (&events);
-  td_event_addset (&events, TD_CREATE);
-  td_event_addset (&events, TD_DEATH);
+
+/* XXX PR ports/162093
+ * td_event_addset (&events, TD_CREATE);
+ * td_event_addset (&events, TD_DEATH);
+*/
 
   err = td_ta_set_event_p (thread_agent, &events);
   if (err != TD_OK)
@@ -374,6 +377,7 @@ enable_thread_event_reporting (void)
   td_create_bp_addr = 0;
   td_death_bp_addr = 0;
 
+#if 0
   /* Set up the thread creation event.  */
   err = enable_thread_event (thread_agent, TD_CREATE, &td_create_bp_addr);
   if (err != TD_OK)
@@ -391,6 +395,7 @@ enable_thread_event_reporting (void)
 	       thread_db_err_str (err));
       return;
     }
+#endif
 }
 
 static void