diff --git a/runc.changes b/runc.changes
index e05f50e..cba6b0a 100644
--- a/runc.changes
+++ b/runc.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sun Mar 27 14:50:32 UTC 2016 - asarai@suse.de
+
+* Added runC man pages.
+* Recommended criu, since it's required for the checkpoint and restore
+  functionality.
+
 -------------------------------------------------------------------
 Sun Mar 27 10:14:32 UTC 2016 - asarai@suse.de
 
diff --git a/runc.spec b/runc.spec
index b8442b0..ef3268a 100644
--- a/runc.spec
+++ b/runc.spec
@@ -37,12 +37,14 @@ Source:         %{name}-%{version}.tar.xz
 Patch0:         seccomp-use-pkg-config.patch
 %ifarch %go_arches
 BuildRequires:  go >= 1.5
+BuildRequires:  go-go-md2man
 %else
 BuildRequires:  gcc5-go >= 5.0
 %endif
 BuildRequires:  libapparmor-devel
 BuildRequires:  libseccomp-devel
 BuildRequires:  libselinux-devel
+Recommends:     criu
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -73,9 +75,19 @@ export BUILDTAGS="$BUILDTAGS seccomp"
 # Build runc.
 %go_tool build %GO_BUILD_FLAGS -tags "$BUILDTAGS" -x -o %{name}-%{version} github.com/opencontainers/%{name}
 
+# Build man pages, this can only be done on arches where we can build go-md2man.
+%ifarch %go_arches
+man/md2man-all.sh
+%endif
+
 %install
 %{__install} -D -m755 %{name}-%{version} %{buildroot}/%{_bindir}/%{name}
 
+%ifarch %go_arches
+%{__install} -d -m755 %{buildroot}%{_mandir}/man8
+%{__install} -m644 man/man8/runc*.8 %{buildroot}%{_mandir}/man8
+%endif
+
 %post
 
 %postun
@@ -84,3 +96,7 @@ export BUILDTAGS="$BUILDTAGS seccomp"
 %defattr(-,root,root)
 %doc README.md LICENSE
 %{_bindir}/%{name}
+
+%ifarch %go_arches
+%{_mandir}/man8/runc*.8.gz
+%endif