diff --git a/ChangeLog b/ChangeLog
index b45324d2..ac826857 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-08-25  Joerg Wunsch <j.gnu@uriah.heep.sax.de>
+
+	Fix warnings.
+	* ser_avrdoper.c: add <stdlib.h> so exit() is declared.
+	* usbtiny.c (usbtiny_open): provide an initializer to a
+	"may be used uninitialized" variable (since GCC could not
+	fully detect the logic behind).
+
 2011-08-25  Joerg Wunsch <j.gnu@uriah.heep.sax.de>
 
 	* configure.ac: Add a check for FreeBSD's libusb-1.0
diff --git a/ser_avrdoper.c b/ser_avrdoper.c
index e11fc39c..5a8e59fa 100644
--- a/ser_avrdoper.c
+++ b/ser_avrdoper.c
@@ -31,6 +31,7 @@
 
 #include <stdio.h>
 #include <string.h>
+#include <stdlib.h>
 
 #include "avrdude.h"
 #include "serial.h"
diff --git a/usbtiny.c b/usbtiny.c
index 638e2a13..56467577 100644
--- a/usbtiny.c
+++ b/usbtiny.c
@@ -197,7 +197,7 @@ static	int	usbtiny_open(PROGRAMMER* pgm, char* name)
 {
   struct usb_bus      *bus;
   struct usb_device   *dev = 0;
-  char *bus_name;
+  char *bus_name = NULL;
   char *dev_name = NULL;
 
   // if no -P was given or '-P usb' was given