--- Libc/Libc-320/regex/Makefile.inc
+++ Libc/Libc-583/regex/Makefile.inc
@@ -3,13 +3,19 @@
 
 # regex sources
 .PATH: ${.CURDIR}/regex
-
-CFLAGS+=-DPOSIX_MISTAKE
+CWD := ${.CURDIR}/regex
 
 .include "Makefile.fbsd_begin"
-FBSDSRCS= regcomp.c regerror.c regexec.c regfree.c
-FBSDORIGHDRS= cclass.h cname.h engine.c regex2.h utils.h
+FBSDMISRCS= regcomp.c regerror.c regexec.c regfree.c
+CFLAGS-regcomp-fbsd.c+= -DPOSIX_MISTAKE
+FBSDHDRS= cclass.h cname.h engine.c regex2.h utils.h
 .include "Makefile.fbsd_end"
+
+LEGACYSRCS += regcomp.c
+
+# set the LIBC_ALIAS_* macros so we can decorate the symbol independent
+# of other macro settings
+CFLAGS-regcomp-fbsd.c += -DLIBC_ALIAS_REGCOMP
 
 .if ${LIB} == "c"
 .include "Makefile.fbsd_begin"
@@ -17,6 +23,9 @@
 FBSDMAN7= re_format.7
 .include "Makefile.fbsd_end"
 
-MLINKS+=regex.3 regcomp.3 regex.3 regexec.3 regex.3 regerror.3
-MLINKS+=regexec.3 regfree.3
+MLINKS+= regex.3 regcomp.3		\
+         regex.3 regexec.3		\
+         regex.3 regerror.3
+
+MLINKS+= regexec.3 regfree.3
 .endif