diff --git a/tools/munin-plugins-busybox/cpu.c b/tools/munin-plugins-busybox/cpu.c
index 9f3483f8..3f9d9ff7 100644
--- a/tools/munin-plugins-busybox/cpu.c
+++ b/tools/munin-plugins-busybox/cpu.c
@@ -42,7 +42,7 @@ int cpu(int argc, char **argv) {
 			}
 
 			puts("graph_title CPU usage");
-			if(extinfo == 7)
+			if(extinfo >= 7)
 				puts("graph_order system user nice idle iowait irq softirq");
 			else
 				puts("graph_order system user nice idle");
@@ -87,7 +87,7 @@ int cpu(int argc, char **argv) {
 					"user.cdef user,%d,/\n"
 					"nice.cdef nice,%d,/\n"
 					"idle.cdef idle,%d,/\n", ncpu, ncpu, ncpu, ncpu);
-			if(extinfo == 7) {
+			if(extinfo >= 7) {
 				puts("iowait.label iowait\n"
 					"iowait.draw STACK\n"
 					"iowait.min 0");
diff --git a/tools/munin-plugins-busybox/interrupts.c b/tools/munin-plugins-busybox/interrupts.c
index 8c800c61..32171f6d 100644
--- a/tools/munin-plugins-busybox/interrupts.c
+++ b/tools/munin-plugins-busybox/interrupts.c
@@ -37,10 +37,13 @@ int interrupts(int argc, char **argv) {
 		return 1;
 	}
 	while(fgets(buff, 256, f)) {
-		if(!strncmp(buff, "intr ", 5))
-			printf("intr.value %s", buff+5);
-		else if(!strncmp(buff, "ctxt ", 5))
-			printf("ctx.value %s", buff+5);
+		if(!strncmp(buff, "intr ", 5)) {
+			buff[5 + strcspn(buff + 5, " \t\n")] = '\0';
+			printf("intr.value %s\n", buff+5);
+		} else if(!strncmp(buff, "ctxt ", 5)) {
+			buff[5 + strcspn(buff + 5, " \t\n")] = '\0';
+			printf("ctx.value %s\n", buff+5);
+		}
 	}
 	fclose(f);
 	return 0;