diff --git a/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.c b/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.c
index 85a750454ef9b955a8b6eab1f3c37a141750bbbe..f1bb45a29445a6749fd98d7ebab9242349d66cf4 100644
--- a/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.c
+++ b/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.c
@@ -59,6 +59,7 @@ ISR(TIMER1_COMPA_vect, ISR_BLOCK)
if (!(SoftUSART_BitCount))
return;
+ /* Check to see if we are at a rising or falling edge of the clock */
if (BITBANG_PDICLOCK_PORT & BITBANG_PDICLOCK_MASK)
{
/* If at rising clock edge and we are in send mode, abort */
diff --git a/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.h b/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.h
index 7ebed129c79939b921891f1ec8bc627f86bba1d0..0c54ad4cf35533f03a4bf65250d3b201ba9044b0 100644
--- a/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.h
+++ b/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.h
@@ -57,27 +57,7 @@
/* Defines: */
#if ((BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1))
-// #define XPROG_VIA_HARDWARE_USART
-
- #define BITBANG_PDIDATA_PORT PORTD
- #define BITBANG_PDIDATA_DDR DDRD
- #define BITBANG_PDIDATA_PIN PIND
- #define BITBANG_PDIDATA_MASK (1 << 3)
-
- #define BITBANG_PDICLOCK_PORT PORTD
- #define BITBANG_PDICLOCK_DDR DDRD
- #define BITBANG_PDICLOCK_PIN PIND
- #define BITBANG_PDICLOCK_MASK (1 << 5)
-
- #define BITBANG_TPIDATA_PORT PORTB
- #define BITBANG_TPIDATA_DDR DDRB
- #define BITBANG_TPIDATA_PIN PINB
- #define BITBANG_TPIDATA_MASK (1 << 3)
-
- #define BITBANG_TPICLOCK_PORT PORTB
- #define BITBANG_TPICLOCK_DDR DDRB
- #define BITBANG_TPICLOCK_PIN PINB
- #define BITBANG_TPICLOCK_MASK (1 << 1)
+ #define XPROG_VIA_HARDWARE_USART
#else
#define BITBANG_PDIDATA_PORT PORTB
#define BITBANG_PDIDATA_DDR DDRB
diff --git a/Projects/AVRISP-MKII/makefile b/Projects/AVRISP-MKII/makefile
index b2c139cec8edf4ead20d22a129cc32d75648688c..b0b26c24c1e6a90e5d666f285052dc272c577553 100644
--- a/Projects/AVRISP-MKII/makefile
+++ b/Projects/AVRISP-MKII/makefile
@@ -66,7 +66,7 @@ MCU = at90usb1287
# Target board (see library "Board Types" documentation, NONE for projects not requiring
# LUFA board drivers). If USER is selected, put custom board drivers in a directory called
# "Board" inside the application directory.
-BOARD = XPLAIN
+BOARD = USBKEY
# Processor frequency.