diff --git a/ChangeLog b/ChangeLog
index 6cbd1eb3..34471798 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-12-22 Joerg Wunsch <j@uriah.heep.sax.de>
+
+	* configure.ac (AC_INIT): Bump version to 5.3.1.
+	* avrdude.conf.in (frank-stk200): Fix syntax error.
+	* ser_avrdoper.c: Make #ifdef for Win32/libhid
+	consistent with the initial check: use the HID driver
+	only iff found, otherwise use libusb.
+
 2006-12-21 Joerg Wunsch <j@uriah.heep.sax.de>
 
 	* configure.ac (AC_INIT): Bump version to 5.3cvs.
diff --git a/NEWS b/NEWS
index 9cc9644b..e3393035 100644
--- a/NEWS
+++ b/NEWS
@@ -5,9 +5,7 @@ Approximate change log for AVRDUDE by version.
 (For more detailed changes, see the ChangeLog file.)
 
 ----------------------------------------------------------------------
-Current:
-
-Version 5.3:
+Version 5.3.1:
 
   * Add support for the AVR Dragon (all modes: ISP, JTAG, HVSP, PP,
     debugWire).
diff --git a/avrdude.conf.in b/avrdude.conf.in
index 13ca720b..052e15ba 100644
--- a/avrdude.conf.in
+++ b/avrdude.conf.in
@@ -691,6 +691,7 @@ programmer
   reset = 9;
   miso  = 10;
   pgmled = 8;
+;
 
 @HAVE_PARPORT_END@
 
diff --git a/ser_avrdoper.c b/ser_avrdoper.c
index a4f242ad..0d12682b 100644
--- a/ser_avrdoper.c
+++ b/ser_avrdoper.c
@@ -66,7 +66,7 @@ static int              avrdoperRxPosition = 0; /* amount of bytes already consu
 /* ------------------------------------------------------------------------ */
 /* ------------------------------------------------------------------------ */
 
-#ifdef WIN32NATIVE
+#if defined(WIN32NATIVE) && defined(HAVE_LIBHID)
 
 #include <windows.h>
 #include <setupapi.h>
@@ -242,7 +242,7 @@ static int usbGetReport(union filedescriptor *fdp, int reportType, int reportNum
 /* ------------------------------------------------------------------------ */
 /* ------------------------------------------------------------------------ */
 
-#else /* !WIN32NATIVE */
+#else /* !(WIN32NATIVE && HAVE_LIBHID) */
 
 /* ------------------------------------------------------------------------ */
 /* ------------------------------------------------------------------------ */