diff --git a/corosync.spec.in b/corosync.spec.in
index ab31fd85..c7664f5b 100644
--- a/corosync.spec.in
+++ b/corosync.spec.in
@@ -119,6 +119,7 @@ fi
 %{_mandir}/man8/corosync-keygen.8*
 %{_mandir}/man8/corosync-cfgtool.8*
 %{_mandir}/man8/corosync-cpgtool.8*
+%{_mandir}/man8/corosync-fplay.8*
 %{_mandir}/man5/corosync.conf.5*
 
 
diff --git a/man/Makefile.am b/man/Makefile.am
index 02630912..bf717b18 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -43,6 +43,7 @@ dist_man_MANS = \
 	corosync-keygen.8 \
 	corosync-cfgtool.8 \
 	corosync-cpgtool.8 \
+	corosync-fplay.8 \
 	corosync_overview.8 \
 	cpg_overview.8 \
 	evs_overview.8 \
diff --git a/man/corosync-fplay.8 b/man/corosync-fplay.8
new file mode 100644
index 00000000..37fb91a7
--- /dev/null
+++ b/man/corosync-fplay.8
@@ -0,0 +1,66 @@
+.\"/*
+.\" * Copyright (C) 2010 Red Hat, Inc.
+.\" *
+.\" * All rights reserved.
+.\" *
+.\" * Author: Angus Salkeld <asalkeld@redhat.com>
+.\" *
+.\" * This software licensed under BSD license, the text of which follows:
+.\" *
+.\" * Redistribution and use in source and binary forms, with or without
+.\" * modification, are permitted provided that the following conditions are met:
+.\" *
+.\" * - Redistributions of source code must retain the above copyright notice,
+.\" *   this list of conditions and the following disclaimer.
+.\" * - Redistributions in binary form must reproduce the above copyright notice,
+.\" *   this list of conditions and the following disclaimer in the documentation
+.\" *   and/or other materials provided with the distribution.
+.\" * - Neither the name of Red Hat, Inc. nor the names of its
+.\" *   contributors may be used to endorse or promote products derived from this
+.\" *   software without specific prior written permission.
+.\" *
+.\" * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+.\" * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+.\" * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+.\" * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+.\" * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+.\" * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+.\" * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+.\" * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+.\" * THE POSSIBILITY OF SUCH DAMAGE.
+.\" */
+.TH COROSYNC-FPLAY 8 2010-05-30
+.SH NAME
+corosync-fplay \- Display "flight data" from the corosync "blackbox".
+.SH SYNOPSIS
+.B "corosync-fplay"
+.SH DESCRIPTION
+.B corosync-fplay
+Print out the logs (including debug logs) that were recorded before the last corosync crash.
+.SH EXAMPLES
+.TP
+Get info to help developers diagnose a crash.
+.br
+$ corosync-fplay 
+.br
+Starting replay: head [74205] tail [0]
+.br
+rec=[1] Log Message=Corosync Cluster Engine ('1.2.1'): started and ready to provide service.
+.br
+[...]
+.br
+rec=[2607] Log Message=Delivering MCAST message with seq a to pending delivery queue
+.br
+rec=[2608] Log Message=downlist received left_list: 2
+.br
+rec=[2609] Log Message=chosen downlist from node r(0) ip(192.168.100.11) 
+.br
+Finishing replay: records found [2609]
+.br
+.SH SEE ALSO
+.BR corosync_overview (8),
+.SH AUTHOR
+Angus Salkeld
+.PP