diff --git a/Makefile b/Makefile
index 56d350c..833db88 100644
--- a/Makefile
+++ b/Makefile
@@ -149,6 +149,7 @@ UPROGS=\
 	$U/_sh\
 	$U/_sleep\
 	$U/_stressfs\
+	$U/_uptime\
 	$U/_usertests\
 	$U/_grind\
 	$U/_wc\
diff --git a/user/uptime.c b/user/uptime.c
new file mode 100644
index 0000000..a72f368
--- /dev/null
+++ b/user/uptime.c
@@ -0,0 +1,16 @@
+#include "kernel/types.h"
+#include "user/user.h"
+
+int
+main(int argc, char *argv[])
+{
+
+  if (argc > 1) {
+    fprintf(2, "Usage: uptime\n");
+    exit(1);
+  }
+
+  fprintf(1, "%d ticks\n", uptime());
+
+  exit(0);
+}