Index: uspace/app/ps/ps.c
===================================================================
--- uspace/app/ps/ps.c	(revision c0379fcd0ca28d6439cb4dbc7c14648b1e2d8462)
+++ uspace/app/ps/ps.c	(revision 9d491a79496784dc1a5d4cb56223fbd9702fa819)
@@ -48,4 +48,7 @@
 #define TASK_COUNT 10
 #define THREAD_COUNT 50
+
+#define ECHOLOAD1(x) ((x) >> 11)
+#define ECHOLOAD2(x) (((x) & 0x7ff) / 2)
 
 /** Thread states */
@@ -124,9 +127,6 @@
 {
 	size_t load[3];
-	load[0] = 0;
-	load[1] = 0;
-	load[2] = 0;
 	get_load(load);
-	printf("Current load: %d.%03d %d.%03d %d.%03d\n", load[0] >> 11, (load[0] & 0x7ff) / 2, load[1] >> 11, (load[1] & 0x7ff) / 2, load[2] >> 11, (load[2] & 0x7ff) / 2);
+	printf("System load: %d.%03d %d.%03d %d.%03d\n", ECHOLOAD1(load[0]), ECHOLOAD2(load[0]), ECHOLOAD1(load[1]), ECHOLOAD2(load[1]), ECHOLOAD1(load[2]), ECHOLOAD2(load[2]));
 }
 
Index: uspace/app/uptime/uptime.c
===================================================================
--- uspace/app/uptime/uptime.c	(revision c0379fcd0ca28d6439cb4dbc7c14648b1e2d8462)
+++ uspace/app/uptime/uptime.c	(revision 9d491a79496784dc1a5d4cb56223fbd9702fa819)
@@ -37,12 +37,36 @@
 #include <stdio.h>
 #include <uptime.h>
+#include <sys/time.h>
+#include <load.h>
+
+#define DAY 86400
+#define HOUR 3600
+#define MINUTE 60
+
+#define ECHOLOAD1(x) ((x) >> 11)
+#define ECHOLOAD2(x) (((x) & 0x7ff) / 2)
 
 int main(int argc, char *argv[])
 {
+	struct timeval time;
+	uint64_t sec;
+	if (gettimeofday(&time, NULL) != 0) {
+		printf("Cannot get time of day!\n");
+		return 1;
+	}
+	sec = time.tv_sec;
+	printf("%02llu:%02llu:%02llu", (sec % DAY) / HOUR,
+			(sec % HOUR) / MINUTE, sec % MINUTE);
+
 	uint64_t uptime;
+	get_uptime(&uptime);
+	printf("\tUp %4llu days, %02llu:%02llu:%02llu",
+		uptime / DAY, (uptime % DAY) / HOUR, (uptime % HOUR) / MINUTE, uptime % MINUTE);
 
-	get_uptime(&uptime);
-	printf("Up %llu days, %llu hours, %llu minutes, %llu seconds\n",
-		uptime / 86400, (uptime % 86400) / 3600, (uptime % 3600) / 60, uptime % 60);
+	size_t load[3];
+	get_load(load);
+	printf("\t load: %d.%03d %d.%03d %d.%03d ", ECHOLOAD1(load[0]), ECHOLOAD2(load[0]), ECHOLOAD1(load[1]), ECHOLOAD2(load[1]), ECHOLOAD1(load[2]), ECHOLOAD2(load[2]));
+
+	printf("\n");
 	return 0;
 }
