diff --git a/ChangeLog b/ChangeLog
index 07ffd1cc6..2f54603db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,8 @@ Version 2.5.6dev:
 * Added slirp support (not tested yet, not enabled by default).
 * Enabled A2065 (not tested yet, not enabled by default).
 * FS-UAE now uses automake in addition to autoconf.
+* New requirement: libmpeg2 / libmpeg2convert for CD32 FMV support.
+* Some bugfixes based on static code analysis + code cleanup.
 
 Version 2.5.5dev:
 
diff --git a/configure.ac b/configure.ac
index 4c7c180bb..3501c5638 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,10 +7,9 @@ AC_INIT([FS-UAE], [2.5.6dev],
 AC_CONFIG_AUX_DIR([.])
 AC_CANONICAL_SYSTEM
 AC_CONFIG_SRCDIR([src/main.cpp])
-AM_INIT_AUTOMAKE
 AC_CONFIG_HEADERS([config.h])
 # AC_CONFIG_MACRO_DIRS([m4])
-AM_INIT_AUTOMAKE([subdir-objects])
+AM_INIT_AUTOMAKE([tar-ustar subdir-objects])
 
 AC_SUBST([PACKAGE_SERIES], [devel])
 
diff --git a/src/cdummy.c b/src/cdummy.c
index e69de29bb..8b1378917 100644
--- a/src/cdummy.c
+++ b/src/cdummy.c
@@ -0,0 +1 @@
+
diff --git a/src/cppdummy.cpp b/src/cppdummy.cpp
index 2200e9aa1..8b1378917 100644
--- a/src/cppdummy.cpp
+++ b/src/cppdummy.cpp
@@ -1 +1 @@
-#include "zfile.h"
+
diff --git a/src/include/uae/types.h b/src/include/uae/types.h
index 758518d7e..70bb4ca23 100644
--- a/src/include/uae/types.h
+++ b/src/include/uae/types.h
@@ -5,6 +5,10 @@
 #include "config.h"
 #endif
 
+#ifndef __cplusplus
+#include <stdbool.h>
+#endif
+
 /* Define uae_ integer types. Prefer long long int for uae_x64 since we can
  * then use the %lld format specifier for both 32-bit and 64-bit instead of
  * the ugly PRIx64 macros. */