diff --git a/include/Makefile b/include/Makefile
index 420ec02664e4..14d509e5d75a 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.114 2003/10/01 01:35:39 christos Exp $
+#	$NetBSD: Makefile,v 1.115 2003/10/14 12:46:44 tron Exp $
 #	@(#)Makefile	8.2 (Berkeley) 1/4/94
 
 # Doing a make includes builds /usr/include
@@ -20,7 +20,7 @@ INCS=	a.out.h ar.h assert.h bitstring.h bm.h cpio.h ctype.h db.h dirent.h \
 	sgtty.h signal.h stab.h stddef.h stdio.h stdlib.h string.h \
 	strings.h stringlist.h struct.h sysexits.h tar.h threadlib.h time.h \
 	ttyent.h tzfile.h ucontext.h ulimit.h unistd.h util.h utime.h utmp.h \
-	utmpx.h vis.h wchar.h wctype.h
+	utmpx.h varargs.h vis.h wchar.h wctype.h
 INCS+=	arpa/ftp.h arpa/inet.h arpa/nameser.h arpa/telnet.h arpa/tftp.h
 INCS+=	protocols/dumprestore.h protocols/routed.h protocols/rwhod.h \
 	protocols/talkd.h protocols/timed.h
diff --git a/include/varargs.h b/include/varargs.h
new file mode 100644
index 000000000000..92e0133f1cca
--- /dev/null
+++ b/include/varargs.h
@@ -0,0 +1,50 @@
+/*-
+ * Copyright (c) 2003 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Matthias Scheler.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *        This product includes software developed by the NetBSD
+ *        Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _VARARGS_H_
+#define	_VARARGS_H_
+
+#include <sys/cdefs.h>
+
+#if __GNUC_PREREQ__(3, 3)
+#error "GCC 3.3 and newer no longer implements <varargs.h>."
+#error "Revise your code to use <stdarg.h>."
+#else
+#include <machine/varargs.h>
+#endif
+
+#endif /* !_VARARGS_H_ */
+
diff --git a/sys/arch/Makefile b/sys/arch/Makefile
index 434a5e702983..e826769190dd 100644
--- a/sys/arch/Makefile
+++ b/sys/arch/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.24 2003/08/03 09:23:16 lukem Exp $
+#	$NetBSD: Makefile,v 1.25 2003/10/14 12:46:44 tron Exp $
 
 # For now, we install the machine and arch includes, and symlink 'machine'
 # to the location of the machine includes (usually).
@@ -45,7 +45,6 @@ INCSYMLINKS= ${MACHINE} /usr/include/machine
 
 INCSYMLINKS+= machine/float.h /usr/include/float.h \
 	machine/frame.h /usr/include/frame.h \
-	machine/stdarg.h /usr/include/stdarg.h \
-	machine/varargs.h /usr/include/varargs.h
+	machine/stdarg.h /usr/include/stdarg.h
 
 .include <bsd.kinc.mk>