diff --git a/Makefile b/Makefile
index 65f7f852d..0bbc5c460 100644
--- a/Makefile
+++ b/Makefile
@@ -88,7 +88,7 @@ endif
 
 # Project binaries.
 COMMANDS=ctr containerd containerd-stress
-MANPAGES=ctr.1 containerd.1 containerd-config.1 containerd-config.toml.5
+MANPAGES=ctr.1 containerd.8 containerd-config.1 containerd-config.toml.5
 
 ifdef BUILDTAGS
     GO_BUILDTAGS = ${BUILDTAGS}
@@ -214,9 +214,9 @@ mandir:
 	@mkdir -p man
 
 # Kept for backwards compatability
-genman: man/containerd.1 man/ctr.1
+genman: man/containerd.8 man/ctr.1
 
-man/containerd.1: FORCE
+man/containerd.8: FORCE
 	@echo "$(WHALE) $@"
 	go run cmd/gen-manpages/main.go containerd man/
 
diff --git a/docs/man/containerd-config.1.md b/docs/man/containerd-config.1.md
index 9d59b423f..cca1bbd7c 100644
--- a/docs/man/containerd-config.1.md
+++ b/docs/man/containerd-config.1.md
@@ -38,4 +38,4 @@ Phil Estes <estesp@gmail.com>
 
 ## SEE ALSO
 
-ctr(1), containerd(1), containerd-config.toml(5)
+ctr(1), containerd(8), containerd-config.toml(5)
diff --git a/docs/man/containerd-config.toml.5.md b/docs/man/containerd-config.toml.5.md
index 8f116f446..481422673 100644
--- a/docs/man/containerd-config.toml.5.md
+++ b/docs/man/containerd-config.toml.5.md
@@ -142,4 +142,4 @@ Phil Estes <estesp@gmail.com>
 
 ## SEE ALSO
 
-ctr(1), containerd-config(1), containerd(1)
+ctr(1), containerd-config(1), containerd(8)