diff --git a/Makefile b/Makefile
index b594d05..7a12d17 100644
--- a/Makefile
+++ b/Makefile
@@ -24,6 +24,7 @@ SRC = \
 	lsmod.c             \
 	mkswap.c            \
 	mount.c             \
+	mountpoint.c        \
 	pivot_root.c        \
 	ps.c                \
 	reboot.c            \
diff --git a/TODO b/TODO
index 035f2f2..062ef68 100644
--- a/TODO
+++ b/TODO
@@ -3,7 +3,6 @@ Tools
  * vmstat(8)
  * top(1)
  * Better ps(1) support
- * mountpoint(1)
  * swaplabel(8)
  * last(1)
 
diff --git a/mountpoint.c b/mountpoint.c
new file mode 100644
index 0000000..a79ff1b
--- /dev/null
+++ b/mountpoint.c
@@ -0,0 +1,42 @@
+/* See LICENSE file for copyright and license details. */
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "grabmntinfo.h"
+#include "util.h"
+
+static void
+usage(void)
+{
+	eprintf("usage: %s target\n", argv0);
+}
+
+int
+main(int argc, char *argv[])
+{
+	int i;
+	struct mntinfo *minfo = NULL;
+	int siz;
+	int ret = 0;
+
+	ARGBEGIN {
+	default:
+		usage();
+	} ARGEND;
+
+	if (argc < 1)
+		usage();
+
+	siz = grabmntinfo(&minfo);
+	if (!siz)
+		eprintf("grabmntinfo:");
+	for (i = 0; i < siz; i++)
+		if (!strcmp(minfo[i].mntdir, argv[0]))
+			break;
+	free(minfo);
+
+	if (i == siz)
+		ret = 1;
+
+	return ret;
+}