--- /dev/null
+diff --git a/CHANGELOG b/CHANGELOG
+index 3557b16..7e58092 100644
+--- a/CHANGELOG
++++ b/CHANGELOG
+@@ -46,6 +46,7 @@
+ - fix large group handling (Ryan Thomas).
+ - fix for dynamic logging breaking non-sasl build (Guillaume Rousse)
+ - eliminate NULL proc ping for singleton host or local mounts.
++- fix incorrect read/write size of startup status token (Matthias Koenig).
+
+ 18/06/2007 autofs-5.0.2
+ -----------------------
+diff --git a/daemon/automount.c b/daemon/automount.c
+index 7becad5..f31ec11 100644
+--- a/daemon/automount.c
++++ b/daemon/automount.c
+@@ -1125,7 +1125,7 @@ static void become_daemon(unsigned foreground)
+ if (pid > 0) {
+ int r;
+ close(start_pipefd[1]);
+- r = read(start_pipefd[0], pst_stat, sizeof(pst_stat));
++ r = read(start_pipefd[0], pst_stat, sizeof(*pst_stat));
+ if (r < 0)
+ exit(1);
+ exit(*pst_stat);
+@@ -2061,12 +2061,12 @@ int main(int argc, char *argv[])
+ if (!master_read_master(master_list, age, 0)) {
+ master_kill(master_list);
+ *pst_stat = 3;
+- res = write(start_pipefd[1], pst_stat, sizeof(pst_stat));
++ res = write(start_pipefd[1], pst_stat, sizeof(*pst_stat));
+ close(start_pipefd[1]);
+ exit(3);
+ }
+
+- res = write(start_pipefd[1], pst_stat, sizeof(pst_stat));
++ res = write(start_pipefd[1], pst_stat, sizeof(*pst_stat));
+ close(start_pipefd[1]);
+
+ state_mach_thid = pthread_self();