diff --git a/src/Makefile.am b/src/Makefile.am
index 6e72a6122..512aade46 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,9 +21,10 @@ FTDI2232LIB = -lftdi
 else
 if PRESTO_LIBFTDI
 FTDI2232LIB = -lftdi
-endif
+else
 FTDI2232LIB =
 endif
+endif
 
 if USBPROG
 LIBUSB = -lusb
diff --git a/src/jtag/Makefile.am b/src/jtag/Makefile.am
index b993b1ced..a35e3f3f1 100644
--- a/src/jtag/Makefile.am
+++ b/src/jtag/Makefile.am
@@ -70,9 +70,10 @@ PRESTOFILES = presto.c
 else
 if PRESTO_FTD2XX
 PRESTOFILES = presto.c
-endif
+else
 PRESTOFILES =
 endif
+endif
 
 if USBPROG
 USBPROGFILES = usbprog.c
diff --git a/src/openocd.c b/src/openocd.c
index f7261c779..7e85c82b6 100644
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -18,7 +18,7 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#define OPENOCD_VERSION "Open On-Chip Debugger (2007-08-14 11:45 CEST)"
+#define OPENOCD_VERSION "Open On-Chip Debugger (2007-08-14 12:00 CEST)"
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"