diff --git a/sci-mathematics/clasp/clasp-3.3.8.ebuild b/sci-mathematics/clasp/clasp-3.3.8-r1.ebuild
similarity index 84%
rename from sci-mathematics/clasp/clasp-3.3.8.ebuild
rename to sci-mathematics/clasp/clasp-3.3.8-r1.ebuild
index d033cf20f8..920e6506a4 100644
--- a/sci-mathematics/clasp/clasp-3.3.8.ebuild
+++ b/sci-mathematics/clasp/clasp-3.3.8-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake flag-o-matic
+inherit cmake edo flag-o-matic
 
 DESCRIPTION="A conflict-driven nogood learning answer set solver"
 HOMEPAGE="
@@ -24,10 +24,11 @@ DEPEND="
 "
 
 RESTRICT="!test? ( test )"
+PATCHES=( "${FILESDIR}/${PN}-manpage.patch" )
 
 src_prepare() {
 	append-cxxflags "-I/usr/include/catch2"
-	rm tests/catch.hpp || die
+	edo rm tests/catch.hpp
 	cmake_src_prepare
 }
 
@@ -45,3 +46,9 @@ src_configure() {
 	)
 	cmake_src_configure
 }
+
+src_install() {
+	cmake_src_install
+	doman clasp.1
+	dodoc README.md CHANGES
+}
diff --git a/sci-mathematics/clasp/files/clasp-manpage.patch b/sci-mathematics/clasp/files/clasp-manpage.patch
new file mode 100644
index 0000000000..136ab5ea4d
--- /dev/null
+++ b/sci-mathematics/clasp/files/clasp-manpage.patch
@@ -0,0 +1,68 @@
+From: Thomas Krennwallner <tkren@kr.tuwien.ac.at>
+Date: Wed, 30 Nov 2016 08:39:00 +0100
+Subject: Add clasp.1 manpage
+
+--- /dev/null
++++ b/clasp.1
+@@ -0,0 +1,61 @@
++.\"                                      Hey, EMACS: -*- nroff -*-
++.\" First parameter, NAME, should be all caps
++.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
++.\" other parameters are allowed: see man(7), man(1)
++.TH CLASP 1 "March  4, 2010"
++.\" Please adjust this date whenever revising the manpage.
++.\"
++.\" Some roff macros, for reference:
++.\" .nh        disable hyphenation
++.\" .hy        enable hyphenation
++.\" .ad l      left justify
++.\" .ad b      justify to both left and right margins
++.\" .nf        disable filling
++.\" .fi        enable filling
++.\" .br        insert line break
++.\" .sp <n>    insert n+1 empty lines
++.\" for manpage-specific macros, see man(7)
++.SH NAME
++clasp \- a conflict-driven nogood learning answer set solver 
++.SH SYNOPSIS
++.B clasp
++[\fInumber\fR] \fR[\fIoptions\fR]
++.SH DESCRIPTION
++This manual page documents briefly the
++.B clasp
++command.
++.PP
++.\" TeX users may be more comfortable with the \fB<whatever>\fP and
++.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
++.\" respectively.
++\fBclasp\fP is an answer set solver for (extended) normal logic
++programs. It combines the high-level modeling capacities of answer set
++programming (ASP) with state-of-the-art techniques from the area of
++Boolean constraint solving. The primary clasp algorithm relies on
++conflict-driven nogood learning, a technique that proved very
++successful for satisfiability checking (SAT). Unlike other learning
++ASP solvers, clasp does not rely on legacy software, such as a SAT
++solver or any other existing ASP solver. Rather, clasp has been
++genuinely developed for answer set solving based on conflict-driven
++nogood learning. clasp can be applied as an ASP solver (on LPARSE
++output format), as a SAT solver (on simplified DIMACS/CNF format), or
++as a PB solver (on OPB format).
++.SH OPTIONS
++These programs follow the usual GNU command line syntax, with long
++options starting with two dashes (`-').
++A summary of options is included below.
++For a complete description, see <http://www.potassco.org/clasp/>.
++.TP
++.B \-h, \-\-help
++Show summary of options.
++.TP
++.B \-v, \-\-version
++Show version of program.
++.SH SEE ALSO
++.BR gringo (1).
++.br
++.SH AUTHOR
++clasp was written by Benjamin Kaufmann <kaufmann@cs.uni-potsdam.de>.
++.PP
++This manual page was written by Thomas Krennwallner <tkren@kr.tuwien.ac.at>,
++for the Debian project (and may be used by others).