diff --git a/main/apache2/APKBUILD b/main/apache2/APKBUILD
index 85495b20644448e601041c8836e67cd7399d3d78..dc0cb81deb87c4d45c673b0066c736ef491f8874 100644
--- a/main/apache2/APKBUILD
+++ b/main/apache2/APKBUILD
@@ -2,7 +2,7 @@
 # Contributor: Valery Kartel <valery.kartel@gmail.com>
 pkgname=apache2
 _pkgreal=httpd
-pkgver=2.4.56
+pkgver=2.4.57
 pkgrel=0
 pkgdesc="A high performance Unix-based HTTP server"
 url="https://httpd.apache.org/"
@@ -155,11 +155,7 @@ builddir="$srcdir"/$_pkgreal-$pkgver
 #     - CVE-2017-7679
 
 prepare() {
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$(basename $i);;
-		esac
-	done
+	default_prepare
 
 	cat "$srcdir/alpine.layout" >> config.layout
 }
@@ -217,7 +213,7 @@ package() {
 	mv "$pkgdir"/etc/apache2/extra "$pkgdir"/etc/apache2/conf.d
 	for file in "$pkgdir"/etc/apache2/conf.d/httpd-*; do
 		mv "$file" \
-			"$(dirname $file)/${file#$pkgdir/etc/apache2/conf.d/httpd-}"
+			"$(dirname $file)/${file#"$pkgdir"/etc/apache2/conf.d/httpd-}"
 	done
 	sed -Ei \
 		's:^(\t?#?LoadModule .+ )lib/apache2/:\1modules/:;ta;b;:a;s/^#?LoadModule (dav.*|lbmethod_.+|.*ldap|lua|proxy.*|ssl|xml2enc)_module //;tb;b;:b;d' \
@@ -263,7 +259,7 @@ _mv_conf() {
 _load_mod() {
 	_make_conf_dir
 	echo "LoadModule $1_module modules/mod_$1.so" >> \
-		"$_conf_dir"/${subpkgname#$pkgname-}.conf
+		"$_conf_dir"/${subpkgname#"$pkgname"-}.conf
 }
 
 _load_mods() {
@@ -412,8 +408,9 @@ _lua() {
 		"$subpkgdir"/usr/lib/apache2/
 	_load_mods
 }
+
 sha512sums="
-5f12cd9878d822384b1bb163fea4d8edee5e7a0dd8b2389264387971268145cccc6a5a27ddf0436c5f1f631acc5fdc4874da2a47911483e421ca40bf783e0e12  httpd-2.4.56.tar.bz2
+4d1e0a274ee90bdfb5f38d4a7d73a7367ed1c6388e26280e640014e49abc0df03683705b88dcfe2ec2da313dda4c7b4a3b86daffa1911f58e224eba89d82d155  httpd-2.4.57.tar.bz2
 8e62b101f90c67babe864bcb74f711656180b011df3fd4b541dc766b980b72aa409e86debf3559a55be359471c1cad81b8779ef3a55add8d368229fc7e9544fc  apache2.confd
 18e8859c7d99c4483792a5fd20127873aad8fa396cafbdb6f2c4253451ffe7a1093a3859ce719375e0769739c93704c88897bd087c63e1ef585e26dcc1f5dd9b  apache2.logrotate
 81a2d2a297d8049ba1b021b879ec863767149e056d9bdb2ac8acf63572b254935ec96c2e1580eba86639ea56433eec5c41341e4f1501f9072745dccdb3602701  apache2.initd