diff --git a/Makefile b/Makefile
index 5d8b2ad2a23698fcf53d9a4527a576c209b28c59..0771c1c23b54d8d83f6e24e4499461d6d167a651 100644
--- a/Makefile
+++ b/Makefile
@@ -56,6 +56,10 @@ ifeq (${softi2c_pullup}, 1)
 	COMMON_FLAGS += -DSOFTI2C_PULLUP
 endif
 
+ifeq (${kout_nop}, 1)
+	COMMON_FLAGS += -DKOUT_NOP
+endif
+
 ifeq (${timer_cycles}, 1)
 	COMMON_FLAGS += -DTIMER_CYCLES
 endif
diff --git a/src/arch/blinkenrocket/driver/stdout.cc b/src/arch/blinkenrocket/driver/stdout.cc
index 961cf46fa3bc49e3d5d0f7df0f87244c69f37f99..195ba96e0e217dce8cf5bf34985b6fb67acaf326 100644
--- a/src/arch/blinkenrocket/driver/stdout.cc
+++ b/src/arch/blinkenrocket/driver/stdout.cc
@@ -4,12 +4,15 @@
 
 void StandardOutput::setup()
 {
+#ifndef KOUT_NOP
 	PORTC |= _BV(PC1);
 	DDRC |= _BV(DDC1);
+#endif
 }
 
 void StandardOutput::put(char c)
 {
+#ifndef KOUT_NOP
 	unsigned char i = 1;
 	PORTC &= ~_BV(PC1);
 	__builtin_avr_delay_cycles(59);
@@ -30,6 +33,7 @@ void StandardOutput::put(char c)
 	if (c == '\n') {
 		put('\r');
 	}
+#endif
 }
 
 StandardOutput kout;