diff --git a/gnu/lib/libregex/Makefile b/gnu/lib/libregex/Makefile
index 224a54655b8..65791b75cb3 100644
--- a/gnu/lib/libregex/Makefile
+++ b/gnu/lib/libregex/Makefile
@@ -6,8 +6,10 @@ LIB=		gnuregex
 SHLIB_MAJOR=	2
 
 SRCS=	regex.c
+INCSGROUPS=	INCS WRINCS
 INCS=	regex.h
-INCSDIR=   ${INCLUDEDIR}/gnu
+INCSDIR=	${INCLUDEDIR}/gnu
+WRINCS=	gnuregex.h
 NOMAN=	noman
 
 CFLAGS+=-I${.CURDIR} -DHAVE_STRING_H=1 -DSTDC_HEADERS=1 -DNO_POSIX_COMPAT=1
diff --git a/gnu/lib/libregex/gnuregex.h b/gnu/lib/libregex/gnuregex.h
new file mode 100644
index 00000000000..4d7246a81ed
--- /dev/null
+++ b/gnu/lib/libregex/gnuregex.h
@@ -0,0 +1,3 @@
+/* $FreeBSD$ */
+#warning "<gnuregex.h> has been replaced by <gnu/regex.h>"
+#include <gnu/regex.h>