diff --git a/ChangeLog b/ChangeLog
index be89a640..710287e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 
 	* avrftdi_private.h: Add libusb-1.0 include to fix include order in windows.
 	* NEWS: Add notice avrftdi supporting TPI
+	* avr.c: Fix avr_tpi_poll_nvmbsy() - poll read data instead of return code
 
 2013-04-30  Hannes Weisbach <hannes_weisbach@gmx.net>
 
diff --git a/avr.c b/avr.c
index 3a81b03e..e79de0ef 100644
--- a/avr.c
+++ b/avr.c
@@ -51,7 +51,7 @@ int avr_tpi_poll_nvmbsy(PROGRAMMER *pgm)
 
   cmd = TPI_CMD_SIN | TPI_SIO_ADDR(TPI_IOREG_NVMCSR);
   rc = pgm->cmd_tpi(pgm, &cmd, 1, &res, 1);
-  return (rc & TPI_IOREG_NVMCSR_NVMBSY);
+  return (res & TPI_IOREG_NVMCSR_NVMBSY);
 }
 
 /* TPI: setup NVMCMD register and pointer register (PR) for read/write/erase */