diff --git a/ChangeLog b/ChangeLog
index 975f5231..9ee8f6f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-09-14  Joerg Wunsch <j.gnu@uriah.heep.sax.de>
+
+	* stk500v2.c (DEBUG, DEBUGRECV): define these unconditionally,
+	as MSG_TRACE2 messages.
+
 2016-05-10  Joerg Wunsch <j.gnu@uriah.heep.sax.de>
 
 	Submitted by Hannes Jochriem:
diff --git a/stk500v2.c b/stk500v2.c
index 5f1f79ed..7ff773b5 100644
--- a/stk500v2.c
+++ b/stk500v2.c
@@ -78,17 +78,9 @@
 // Retry count
 #define RETRIES 5
 
-#if 0
-#define DEBUG(...) avrdude_message(MSG_INFO, __VA_ARGS__)
-#else
-#define DEBUG(...)
-#endif
+#define DEBUG(...) avrdude_message(MSG_TRACE2, __VA_ARGS__)
 
-#if 0
-#define DEBUGRECV(...) avrdude_message(MSG_INFO, __VA_ARGS__)
-#else
-#define DEBUGRECV(...)
-#endif
+#define DEBUGRECV(...) avrdude_message(MSG_TRACE2, __VA_ARGS__)
 
 enum hvmode
 {