diff --git a/gnu/usr.bin/binutils/Makefile.inc b/gnu/usr.bin/binutils/Makefile.inc
index a3847263a984..dc42d48ec514 100644
--- a/gnu/usr.bin/binutils/Makefile.inc
+++ b/gnu/usr.bin/binutils/Makefile.inc
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.5 1998/08/22 20:08:21 tv Exp $
+#	$NetBSD: Makefile.inc,v 1.6 1999/02/06 05:27:42 tv Exp $
 
 .if !defined(__MAKEFILE_INC_INCLUDED__)
 __MAKEFILE_INC_INCLUDED__=1
@@ -11,11 +11,6 @@ BFDOBJ!=cd ${TOP}/lib/bfd; \
 
 .PATH:	${srcdir}
 
-# Distribution version
-VERSION=2.8.1
-# Distribution name
-DIST_NAME=binutils-${VERSION}
-
 .include <bsd.own.mk>
 TARGET=${MACHINE_GNU_ARCH}--netbsd
 
@@ -26,7 +21,7 @@ INCLS+=	-I${dist}/bfd
 INCLS+=	-I${dist}/binutils
 INCLS+=	-I${dist}/include
 
-CPPFLAGS+=${INCLS}
+CPPFLAGS+=${INCLS} -DHAVE_CONFIG_H
 
 LIBCOMMONDIR != cd ${.CURDIR}/../common; \
     printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}\n" | ${MAKE} -s -f-
diff --git a/gnu/usr.bin/binutils/c++filt/Makefile b/gnu/usr.bin/binutils/c++filt/Makefile
index 7d6983145567..3c2cc03acbc4 100644
--- a/gnu/usr.bin/binutils/c++filt/Makefile
+++ b/gnu/usr.bin/binutils/c++filt/Makefile
@@ -1,10 +1,10 @@
-#	$NetBSD: Makefile,v 1.7 1999/02/02 22:05:59 tv Exp $
+#	$NetBSD: Makefile,v 1.8 1999/02/06 05:27:43 tv Exp $
 
 PROG=	c++filt
 SRCS=	cplus-dem.c underscore.c
 MAN=	c++filt.1
 
-CPPFLAGS+=-DMAIN -DVERSION='"${VERSION}"'
+CPPFLAGS+=-DMAIN
 
 CLEANFILES+=${PROG}.1
 
diff --git a/gnu/usr.bin/binutils/common/Makefile b/gnu/usr.bin/binutils/common/Makefile
index c05f1f8b2a30..4deeb2a0d6c4 100644
--- a/gnu/usr.bin/binutils/common/Makefile
+++ b/gnu/usr.bin/binutils/common/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 1999/02/02 22:05:59 tv Exp $
+#	$NetBSD: Makefile,v 1.5 1999/02/06 05:27:43 tv Exp $
 
 LIB=	common
 
@@ -6,7 +6,7 @@ SRCS=	arparse.y arlex.l arsup.c bucomm.c version.c filemode.c rddbg.c \
 	debug.c stabs.c ieee.c rdcoff.c wrstabs.c
 YHEADER=1
 
-CPPFLAGS+=-DVERSION='"${VERSION}"' -DTARGET='"${TARGET}"'
+CPPFLAGS+=-DTARGET='"${TARGET}"'
 
 NOPROFILE=
 NOPIC=
diff --git a/gnu/usr.bin/binutils/common/config.h b/gnu/usr.bin/binutils/common/config.h
index fbabaabcfc04..00c52ae73059 100644
--- a/gnu/usr.bin/binutils/common/config.h
+++ b/gnu/usr.bin/binutils/common/config.h
@@ -1,6 +1,15 @@
 /* config.h.  Generated automatically by configure.  */
 /* config.in.  Generated automatically from configure.in by autoheader.  */
 
+/* Name of package.  */
+#define PACKAGE "binutils"
+
+/* Version of package.  */
+#define VERSION "2.9.1"
+
+/* Configured target name.  */
+/* CENSORED - from Makefile */
+
 /* Whether strstr must be declared even if <string.h> is included.  */
 /* #undef NEED_DECLARATION_STRSTR */
 
@@ -29,12 +38,6 @@
 /* Define if you have <sys/wait.h> that is POSIX.1 compatible.  */
 #define HAVE_SYS_WAIT_H 1
 
-/* Define if you have <vfork.h>.  */
-/* #undef HAVE_VFORK_H */
-
-/* Define to `int' if <sys/types.h> doesn't define.  */
-/* #undef pid_t */
-
 /* If using the C implementation of alloca, define if you know the
    direction of stack growth for your system; otherwise it will be
    automatically deduced at run-time.
@@ -44,11 +47,8 @@
  */
 /* #undef STACK_DIRECTION */
 
-/* Define if you have the ANSI C header files.  */
-#define STDC_HEADERS 1
-
-/* Define vfork as fork if vfork does not work.  */
-/* #undef vfork */
+/* Define if lex declares yytext as a char * by default, not a char[].  */
+#define YYTEXT_POINTER 1
 
 /* Is the type time_t defined in <time.h>?  */
 #define HAVE_TIME_T_IN_TIME_H 1