diff --git a/ChangeLog b/ChangeLog
index 7b64eb15..8d593a72 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-12  Michal Ludvig  <mludvig@logix.net.nz>
+
+	* buspirate.c: Initialise firmware version to v0.0
+	prior to parsing the buspirate banner.
+
 2010-01-11  Joerg Wunsch <j.gnu@uriah.heep.sax.de>
 
 	Clean-up the Xmega erase functions.
diff --git a/buspirate.c b/buspirate.c
index fb06c074..32863d0b 100644
--- a/buspirate.c
+++ b/buspirate.c
@@ -535,7 +535,7 @@ static void buspirate_enable(struct programmer_t *pgm)
 {
 	unsigned char *reset_str = "#\n";
 	char *rcvd;
-	int fw_v1, fw_v2;
+	int fw_v1 = 0, fw_v2 = 0;
 	int rc, print_banner = 0;
 
 	printf("Detecting BusPirate...\n");