diff --git a/external/gpl3/Makefile b/external/gpl3/Makefile
index 431ba6b5a795..e8995ff0e10a 100644
--- a/external/gpl3/Makefile
+++ b/external/gpl3/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.12 2015/08/15 09:34:17 christos Exp $
+#	$NetBSD: Makefile,v 1.13 2015/08/16 09:17:18 christos Exp $
 
 .include <bsd.own.mk>
 
@@ -11,9 +11,11 @@ SUBDIR+=	${EXTERNAL_GCC_SUBDIR}
 .endif
 
 .if ${MKGDB} != "no"
-.if ${HAVE_GDB} == "7"
-SUBDIR+=        gdb.old
-.endif
+.	if ${HAVE_GDB} == "79"
+SUBDIR+=        gdb
+.	elif ${HAVE_GDB} == "7"
+SUBDIR+=        gdb
+.	endif
 .endif
 
 .include <bsd.subdir.mk>
diff --git a/tools/gdb/Makefile b/tools/gdb/Makefile
index 90e627a5199c..27db381c6b21 100644
--- a/tools/gdb/Makefile
+++ b/tools/gdb/Makefile
@@ -1,9 +1,13 @@
-#	$NetBSD: Makefile,v 1.23 2015/08/15 21:12:28 mrg Exp $
+#	$NetBSD: Makefile,v 1.24 2015/08/16 09:14:53 christos Exp $
 
 .include <bsd.own.mk>
 
 MODULE=		gdb
+.if ${HAVE_GDB} == 79
+GNUHOSTDIST=    ${.CURDIR}/../../external/gpl3/gdb/dist
+.else
 GNUHOSTDIST=    ${.CURDIR}/../../external/gpl3/gdb.old/dist
+.endif
 
 FIND_ARGS=	\! \( -type d -name sim -prune \)