diff --git a/app-web/httpd/autobuild/build b/app-web/httpd/autobuild/build
new file mode 100644
index 000000000000..67d82a3659c5
--- /dev/null
+++ b/app-web/httpd/autobuild/build
@@ -0,0 +1,10 @@
+abinfo "Configuring Apache HTTPD ..."
+"$SRCDIR"/configure \
+    "${AUTOTOOLS_AFTER[@]}"
+
+abinfo "Building Apache HTTPD ..."
+make
+
+abinfo "Installing Apache HTTPD ..."
+make install \
+    DESTDIR="$PKGDIR"
diff --git a/app-web/httpd/autobuild/defines b/app-web/httpd/autobuild/defines
index a72b79ffc3f6..4fbd639642d7 100644
--- a/app-web/httpd/autobuild/defines
+++ b/app-web/httpd/autobuild/defines
@@ -46,3 +46,6 @@ AUTOTOOLS_AFTER=(
     --enable-pie
     --enable-option-checking=fatal
 )
+
+# FIXME: make install is not reliable with parallelism.
+NOPARALLEL=1
diff --git a/app-web/httpd/autobuild/prepare b/app-web/httpd/autobuild/prepare
index f70fb3c1c796..0bd366270204 100644
--- a/app-web/httpd/autobuild/prepare
+++ b/app-web/httpd/autobuild/prepare
@@ -27,7 +27,3 @@ chmod -v a-s "$SRCDIR"
 
 abinfo "Appending -lsystemd to LDFLAGS to fix build ..."
 export LDFLAGS="${LDFLAGS} -lsystemd"
-
-# FIXME: Conflicts with layout settings.
-abinfo "Unsetting AUTOTOOLS_DEF to prevent conflicts with layout settings ..."
-unset AUTOTOOLS_DEF
diff --git a/app-web/httpd/spec b/app-web/httpd/spec
index db0ec0e5419f..8fd1e606895f 100644
--- a/app-web/httpd/spec
+++ b/app-web/httpd/spec
@@ -1,4 +1,4 @@
-VER=2.4.57
+VER=2.4.58
 SRCS="tbl::http://archive.apache.org/dist/httpd/httpd-$VER.tar.bz2"
-CHKSUMS="sha256::dbccb84aee95e095edfbb81e5eb926ccd24e6ada55dcd83caecb262e5cf94d2a"
+CHKSUMS="sha256::fa16d72a078210a54c47dd5bef2f8b9b8a01d94909a51453956b3ec6442ea4c5"
 CHKUPDATE="anitya::id=1335"