diff --git a/build/Makefile.global b/build/Makefile.global
index 466acc9e635..37b48ba2980 100644
--- a/build/Makefile.global
+++ b/build/Makefile.global
@@ -132,7 +132,7 @@ distclean: clean
rm -f sapi/fpm/php-fpm.conf sapi/fpm/init.d.php-fpm sapi/fpm/php-fpm.service sapi/fpm/php-fpm.8 sapi/fpm/status.html
rm -f ext/phar/phar.phar ext/phar/phar.php
if test "$(srcdir)" != "$(builddir)"; then \
- rm -f ext/phar/phar/phar.inc; \
+ rm -f ext/phar/phar/phar.inc; \
fi
prof-gen:
diff --git a/ext/phar/Makefile.frag b/ext/phar/Makefile.frag
index 82c20e0eeee..cedde76df70 100644
--- a/ext/phar/Makefile.frag
+++ b/ext/phar/Makefile.frag
@@ -29,7 +29,6 @@ $(builddir)/phar/phar.inc: $(srcdir)/phar/phar.inc
-@test -d $(builddir)/phar || mkdir $(builddir)/phar
-@test -f $(builddir)/phar/phar.inc || cp $(srcdir)/phar/phar.inc $(builddir)/phar/phar.inc
-
TEST_PHP_EXECUTABLE = $(shell $(PHP_EXECUTABLE) -v 2>&1)
TEST_PHP_EXECUTABLE_RES = $(shell echo "$(TEST_PHP_EXECUTABLE)" | grep -c 'Exec format error')
diff --git a/ext/phar/phar.1.in b/ext/phar/phar.1.in
index 5312af57006..db22d40abc3 100644
--- a/ext/phar/phar.1.in
+++ b/ext/phar/phar.1.in
@@ -116,7 +116,6 @@ Regular expression for input files to exclude.
.B ...
Directory to extract to (defaults to '.').
-
.SH help command
This help or help for a selected command.
.P
@@ -165,7 +164,6 @@ Specifies a regular expression for input files.
.B -x \fIregex\fP
Regular expression for input files to exclude.
-
.SH meta-del command
Delete meta information of a PHAR entry or a PHAR package.
.P
@@ -397,7 +395,6 @@ present.
.B \-s \fIstub\fP
Select the \fIstub\fP file.
-
.SH tree command
Get a directory tree for a PHAR archive.
.P
@@ -420,7 +417,6 @@ Regular expression for input files to exclude.
.SH version command
Get information about the PHAR environment and the tool version.
-
.SH COMPRESSION
Algorithms:
.TP 15
diff --git a/sapi/fpm/init.d.php-fpm.in b/sapi/fpm/init.d.php-fpm.in
index 42f94a8a264..e54e0202873 100644
--- a/sapi/fpm/init.d.php-fpm.in
+++ b/sapi/fpm/init.d.php-fpm.in
@@ -17,10 +17,8 @@ php_fpm_BIN=@sbindir@/php-fpm
php_fpm_CONF=@sysconfdir@/php-fpm.conf
php_fpm_PID=@localstatedir@/run/php-fpm.pid
-
php_opts="--fpm-config $php_fpm_CONF --pid $php_fpm_PID"
-
wait_for_pid () {
try=0
diff --git a/sapi/fpm/status.html.in b/sapi/fpm/status.html.in
index a89a34ac62f..31824234a3e 100644
--- a/sapi/fpm/status.html.in
+++ b/sapi/fpm/status.html.in
@@ -74,7 +74,7 @@
-