diff --git a/groups/241.native_packages_inet.group b/groups/241.native_packages_inet.group
index c009f08..afd2394 100644
--- a/groups/241.native_packages_inet.group
+++ b/groups/241.native_packages_inet.group
@@ -66,7 +66,8 @@ pacman rsync socat thttpd w3m weechat wget whois")";
 : ${PKG_HTTPD_SHA256SUM:=f87ec2df1c9fee3e6bfde3c8b855a3ddb7ca1ab20ca877bd0e2b6bf3f05c80b2};
 : ${PKG_HTTPD_VERSION:=2.4.25};
 : ${PKG_HTTPD_URL:=https://archive.apache.org/dist/httpd/httpd-${PKG_HTTPD_VERSION}.tar.bz2};
-: ${PKG_HTTPD_CONFIGURE_ARGS_EXTRA:="--with-apr=${PREFIX_NATIVE}/bin/${DEFAULT_TARGET}-apr-1-config --with-apr-util=${PREFIX_NATIVE}/bin/apu-1-config"};
+: ${PKG_HTTPD_CONFIGURE_ARGS_EXTRA:="--with-pcre=${PREFIX_NATIVE}/bin/pcre-config --with-apr=${PREFIX_NATIVE}/bin/${DEFAULT_TARGET}-apr-1-config --with-apr-util=${PREFIX_NATIVE}/bin/apu-1-config"};
+: ${PKG_HTTPD_ENV_VARS_EXTRA:="PCRE_LIBS=-L${PREFIX_NATIVE}/lib -lpcre"};
 : ${PKG_HTTPD_DISABLED:=1};
 : ${PKG_ICECAST_DEPENDS:="curl expat libressl libvorbis libxml2 libxslt"};
 : ${PKG_ICECAST_SHA256SUM:=eee7644a6bc703f5705ebe6b79c8d20a66a13cc577c60665e2bc2c34e3a0536d};
diff --git a/patches/httpd-2.4.25.local.patch b/patches/httpd-2.4.25.local.patch
index 32b5abf..6e76d75 100644
--- a/patches/httpd-2.4.25.local.patch
+++ b/patches/httpd-2.4.25.local.patch
@@ -60,19 +60,3 @@ diff -ru --new-file httpd-2.4.25.orig/server/test_char.h httpd-2.4.25/server/tes
 +    0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e
 +};
  
---- httpd-2.4.25/server/Makefile.in.orig	2013-10-02 12:20:14.000000000 +0000
-+++ httpd-2.4.25/server/Makefile.in	2017-02-02 23:55:21.521675844 +0000
-@@ -23,10 +23,10 @@
- include $(top_builddir)/build/rules.mk
- include $(top_srcdir)/build/library.mk
- 
--gen_test_char_OBJECTS = gen_test_char.lo
--gen_test_char: $(gen_test_char_OBJECTS)
--	$(LINK) $(EXTRA_LDFLAGS) $(gen_test_char_OBJECTS) $(EXTRA_LIBS)
-+gen_test_char: gen_test_char.o
-+	gcc -I$(shell x86_64-nt64-midipix-apr-1-config --includedir) -o $@ $<
- 
-+#If this file is missing, you're doing something wrong...
- test_char.h: gen_test_char
- 	./gen_test_char > test_char.h
- 
diff --git a/patches/httpd/no-codegen.patch b/patches/httpd/no-codegen.patch
new file mode 100644
index 0000000..45948b2
--- /dev/null
+++ b/patches/httpd/no-codegen.patch
@@ -0,0 +1,26 @@
+diff -ru httpd-2.4.25.orig/server/Makefile.in httpd-2.4.25/server/Makefile.in
+--- httpd-2.4.25.orig/server/Makefile.in	2013-10-02 14:20:14.000000000 +0200
++++ httpd-2.4.25/server/Makefile.in	2020-04-25 20:35:23.286880934 +0200
+@@ -16,22 +16,11 @@
+ 	eoc_bucket.c eor_bucket.c core_filters.c \
+ 	util_expr_parse.c util_expr_scan.c util_expr_eval.c
+ 
+-LTLIBRARY_DEPENDENCIES = test_char.h
+-
+ TARGETS = delete-exports $(LTLIBRARY_NAME) $(CORE_IMPLIB_FILE) export_vars.h httpd.exp
+ 
+ include $(top_builddir)/build/rules.mk
+ include $(top_srcdir)/build/library.mk
+ 
+-gen_test_char_OBJECTS = gen_test_char.lo
+-gen_test_char: $(gen_test_char_OBJECTS)
+-	$(LINK) $(EXTRA_LDFLAGS) $(gen_test_char_OBJECTS) $(EXTRA_LIBS)
+-
+-test_char.h: gen_test_char
+-	./gen_test_char > test_char.h
+-
+-util.lo: test_char.h
+-
+ EXPORT_DIRS = $(top_srcdir)/include $(top_srcdir)/os/$(OS_DIR)
+ EXPORT_DIRS_APR = $(APR_INCLUDEDIR) $(APU_INCLUDEDIR)
+