diff --git a/debian/changelog b/debian/changelog
index 65c4431..a758a37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+main-menu (0.056) UNRELEASED; urgency=low
+
+  * Bastian Blank
+    - Fix isinstallable calls.
+    - Build-Depend against libdebian-installer4-dev (>= 0.18).
+
+ -- Bastian Blank <waldi@debian.org>  Fri, 23 Jan 2004 10:22:30 +0100
+
 main-menu (0.055) unstable; urgency=low
 
   * Nikolai Prokoschenko
diff --git a/debian/control b/debian/control
index d277511..6a90000 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: debian-installer
 Priority: standard
 Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
 Uploaders: Joey Hess <joeyh@debian.org>, Martin Sjogren <sjogren@debian.org>, Petter Reinholdtsen <pere@debian.org>, Matt Kraai <kraai@debian.org>
-Build-Depends: debhelper (>= 4.1.13), dpkg-dev (>= 1.9), libdebconfclient0-dev (>= 0.47), libdebian-installer4-dev (>= 0.17), po-debconf (>= 0.5.0)
+Build-Depends: debhelper (>= 4.1.13), dpkg-dev (>= 1.9), libdebconfclient0-dev (>= 0.47), libdebian-installer4-dev (>= 0.18), po-debconf (>= 0.5.0)
 
 Package: main-menu
 Architecture: any
diff --git a/main-menu.c b/main-menu.c
index 9a2d403..561fde2 100644
--- a/main-menu.c
+++ b/main-menu.c
@@ -60,12 +60,18 @@ int isdefault(di_system_package *p) {
 	int check;
 
 	check = di_system_dpkg_package_control_file_exec(&p->p, "menutest", 0, NULL);
-	if (!check || p->p.status == di_package_status_unpacked || p->p.status == di_package_status_half_configured) {
-		return 1;
-	}
-	else {
-		return 0;
-	}
+	if (check <= 0 || p->p.status == di_package_status_unpacked || p->p.status == di_package_status_half_configured)
+		return true;
+	return false;
+}
+
+bool isinstallable(di_system_package *p) {
+	int check;
+
+	check = di_system_dpkg_package_control_file_exec(&p->p, "isinstallable", 0, NULL);
+	if (check <= 0)
+		return true;
+	return false;
 }
 
 int provides_installed_virtual_package(di_package *p) {
@@ -100,7 +106,7 @@ get_default_menu_item(di_slist *list)
 		p = node->data;
 		if (!p->installer_menu_item ||
 		    p->p.status == di_package_status_installed ||
-		    !di_system_dpkg_package_control_file_exec(&p->p, "isinstallable", 0, NULL))
+		    !isinstallable(p))
 			continue;
 		/* If menutest says this item should be default, make it so */
 		if (!isdefault(p))
@@ -216,7 +222,7 @@ di_system_package *show_main_menu(di_packages *packages, di_packages_allocator *
 	for (node = list->head; node != NULL; node = node->next) {
 		p = node->data;
 		if (!p->installer_menu_item ||
-		    !di_system_dpkg_package_control_file_exec(&p->p, "isinstallable", 0, NULL))
+		    !isinstallable(p))
 			continue;
 		size = menu_entry(debconf, language, p, buf, sizeof (buf));
 		if (menu_used + size + 2 > menu_size)