Index: kernel/generic/src/proc/task.c
===================================================================
--- kernel/generic/src/proc/task.c	(revision d4e38c74100f1742565d55a85aba5978176a3fa4)
+++ kernel/generic/src/proc/task.c	(revision b5ed4f8617310b06cf9b34a72a976bd4eaad6a71)
@@ -421,8 +421,13 @@
 	char suffix;
 	order(task_get_accounting(t), &cycles, &suffix);
-			
-	printf("%-6llu %-10s %-3ld %#10zx %#10zx %9llu%c %7zd %6zd",
-	    t->taskid, t->name, t->context, t, t->as, cycles, suffix,
-	    t->refcount, atomic_get(&t->active_calls));
+	
+	if (sizeof(void *) == 4)
+		printf("%-6llu %-10s %-3ld %#10zx %#10zx %9llu%c %7zd %6zd",
+	    	t->taskid, t->name, t->context, t, t->as, cycles, suffix,
+		    t->refcount, atomic_get(&t->active_calls));
+	else
+		printf("%-6llu %-10s %-3ld %#18zx %#18zx %9llu%c %7zd %6zd",
+		    t->taskid, t->name, t->context, t, t->as, cycles, suffix,
+	    	t->refcount, atomic_get(&t->active_calls));
 	for (j = 0; j < IPC_MAX_PHONES; j++) {
 		if (t->phones[j].callee)
@@ -444,8 +449,15 @@
 	spinlock_lock(&tasks_lock);
 	
-	printf("taskid name       ctx address    as         cycles     threads "
-	    "calls  callee\n");
-	printf("------ ---------- --- ---------- ---------- ---------- ------- "
-	    "------ ------>\n");
+	if (sizeof(void *) == 4) {
+		printf("taskid name       ctx address    as         "
+			"cycles     threads calls  callee\n");
+		printf("------ ---------- --- ---------- ---------- "
+			"---------- ------- ------ ------>\n");
+	} else {
+		printf("taskid name       ctx address            as                 "
+			"cycles     threads calls  callee\n");
+		printf("------ ---------- --- ------------------ ------------------ "
+			"---------- ------- ------ ------>\n");
+	}
 
 	avltree_walk(&tasks_tree, task_print_walker, NULL);
Index: kernel/generic/src/proc/thread.c
===================================================================
--- kernel/generic/src/proc/thread.c	(revision d4e38c74100f1742565d55a85aba5978176a3fa4)
+++ kernel/generic/src/proc/thread.c	(revision b5ed4f8617310b06cf9b34a72a976bd4eaad6a71)
@@ -587,8 +587,13 @@
 	char suffix;
 	order(t->cycles, &cycles, &suffix);
-			
-	printf("%-6llu %-10s %#10zx %-8s %#10zx %-3ld %#10zx %#10zx %9llu%c ",
-	    t->tid, t->name, t, thread_states[t->state], t->task,
-	    t->task->context, t->thread_code, t->kstack, cycles, suffix);
+	
+	if (sizeof(void *) == 4)
+		printf("%-6llu %-10s %#10zx %-8s %#10zx %-3ld %#10zx %#10zx %9llu%c ",
+		    t->tid, t->name, t, thread_states[t->state], t->task,
+	    	t->task->context, t->thread_code, t->kstack, cycles, suffix);
+	else
+		printf("%-6llu %-10s %#18zx %-8s %#18zx %-3ld %#18zx %#18zx %9llu%c ",
+		    t->tid, t->name, t, thread_states[t->state], t->task,
+	    	t->task->context, t->thread_code, t->kstack, cycles, suffix);
 			
 	if (t->cpu)
@@ -597,6 +602,10 @@
 		printf("none");
 			
-	if (t->state == Sleeping)
-		printf(" %#10zx", t->sleep_queue);
+	if (t->state == Sleeping) {
+		if (sizeof(uintptr_t) == 4)
+			printf(" %#10zx", t->sleep_queue);
+		else
+			printf(" %#18zx", t->sleep_queue);
+	}
 			
 	printf("\n");
@@ -614,8 +623,19 @@
 	spinlock_lock(&threads_lock);
 	
-	printf("tid    name       address    state    task       ctx code    "
-	    "   stack      cycles     cpu  waitqueue\n");
-	printf("------ ---------- ---------- -------- ---------- --- --------"
-	    "-- ---------- ---------- ---- ---------\n");
+	if (sizeof(uintptr_t) == 4) {
+		printf("tid    name       address    state    task       "
+			"ctx code       stack      cycles     cpu  "
+			"waitqueue\n");
+		printf("------ ---------- ---------- -------- ---------- "
+			"--- ---------- ---------- ---------- ---- "
+			"----------\n");
+	} else {
+		printf("tid    name       address            state    task               "
+			"ctx code               stack              cycles     cpu  "
+			"waitqueue\n");
+		printf("------ ---------- ------------------ -------- ------------------ "
+			"--- ------------------ ------------------ ---------- ---- "
+			"------------------\n");
+	}
 
 	avltree_walk(&threads_tree, thread_walker, NULL);