diff -Nru android-platform-build-kati-10.0.0+r32/debian/changelog android-platform-build-kati-10.0.0+r32/debian/changelog
--- android-platform-build-kati-10.0.0+r32/debian/changelog	2020-05-11 19:20:29.000000000 +0000
+++ android-platform-build-kati-10.0.0+r32/debian/changelog	2020-05-12 07:20:55.000000000 +0000
@@ -1,3 +1,11 @@
+android-platform-build-kati (10.0.0+r32-6) unstable; urgency=medium
+
+  * Optionally use ronn instead of pandoc which is not always available.
+  * Use ronn to build the manpage on kfreebsd-any m68k sh4 x32.
+  * Update the copyrights.
+
+ -- Andrej Shadura <andrewsh@debian.org>  Tue, 12 May 2020 09:20:55 +0200
+
 android-platform-build-kati (10.0.0+r32-5) unstable; urgency=medium
 
   * Add a manpage.
diff -Nru android-platform-build-kati-10.0.0+r32/debian/ckati.md android-platform-build-kati-10.0.0+r32/debian/ckati.md
--- android-platform-build-kati-10.0.0+r32/debian/ckati.md	2020-05-11 19:20:29.000000000 +0000
+++ android-platform-build-kati-10.0.0+r32/debian/ckati.md	2020-05-12 07:20:55.000000000 +0000
@@ -5,18 +5,15 @@
 footer: ckati
 ---
 
-NAME
-====
+## NAME
 
 ckati - experimental GNU make clone
 
-SYNOPSIS
-========
+## SYNOPSIS
 
-**ckati** [*OPTION*]… [*TARGET*]…
+**ckati** [*OPTION*]... [*TARGET*]...
 
-DESCRIPTION
-===========
+## DESCRIPTION
 
 *ckati* is a C++ implementation of **kati**, an experimental **make** clone.
 
@@ -68,8 +65,7 @@
 When `$(shell find ...)` is used, the find emulator returns results of
 **find** commands using the cached tree, giving a performance boost.
 
-OPTIONS
-=======
+## OPTIONS
 
 **-d**
 
@@ -161,8 +157,7 @@
 
 :   Fail when writing to a read-only directory.
 
-SUPPORTED MAKE FUNCTIONS
-========================
+## SUPPORTED MAKE FUNCTIONS
 
 Text functions:
 
@@ -215,18 +210,15 @@
 * `flavor`
 * `file`
 
-EXIT STATUS
-===========
+## EXIT STATUS
 
 **ckati** exits with a status of zero if all *Makefiles* were successfully
 parsed and no targets that were built failed.
 
-SEE ALSO
-========
+## SEE ALSO
 
 **make**(1), **ninja**(1)
 
-AUTHOR
-======
+## AUTHOR
 
 This manual page was written by Andrej Shadura for the Debian project.
diff -Nru android-platform-build-kati-10.0.0+r32/debian/control android-platform-build-kati-10.0.0+r32/debian/control
--- android-platform-build-kati-10.0.0+r32/debian/control	2020-05-11 19:20:29.000000000 +0000
+++ android-platform-build-kati-10.0.0+r32/debian/control	2020-05-12 07:20:55.000000000 +0000
@@ -7,7 +7,8 @@
  Andrej Shadura <andrewsh@debian.org>
 Build-Depends:
  debhelper-compat (= 12),
- pandoc,
+ pandoc [!kfreebsd-any !m68k !sh4 !x32],
+ ronn [kfreebsd-any m68k sh4 x32],
  ninja-build <!nocheck>,
  ruby <!nocheck>
 Standards-Version: 4.5.0
diff -Nru android-platform-build-kati-10.0.0+r32/debian/copyright android-platform-build-kati-10.0.0+r32/debian/copyright
--- android-platform-build-kati-10.0.0+r32/debian/copyright	2020-05-11 19:20:29.000000000 +0000
+++ android-platform-build-kati-10.0.0+r32/debian/copyright	2020-05-12 07:20:55.000000000 +0000
@@ -14,7 +14,9 @@
 License: Apache-2.0
 
 Files: debian/*
-Copyright: 2019, Katerina <ykaterina0319@gmail.com>
+Copyright:
+ 2019, Katerina <ykaterina0319@gmail.com>
+ 2020, Andrej Shadura <andrewsh@debian.org>
 License: Apache-2.0
 
 License: Apache-2.0
@@ -29,4 +31,4 @@
  distributed under the License is distributed on an "AS IS" BASIS,
  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  See the License for the specific language governing permissions and
- limitations under the License.
\ No newline at end of file
+ limitations under the License.
diff -Nru android-platform-build-kati-10.0.0+r32/debian/md2man android-platform-build-kati-10.0.0+r32/debian/md2man
--- android-platform-build-kati-10.0.0+r32/debian/md2man	1970-01-01 00:00:00.000000000 +0000
+++ android-platform-build-kati-10.0.0+r32/debian/md2man	2020-05-12 07:20:55.000000000 +0000
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+if [ -x /usr/bin/pandoc ]
+then
+    pandoc "$1" -t man -s -o "$2"
+    exit 0
+fi
+
+get_header() {
+    grep "$2:" "$1" | cut -d ' ' -f 2-
+}
+
+sed -e '/---/,/---/d' \
+    -e '/## NAME/,+2 {/## NAME/d; s/^.*-/# /}' "$1" | \
+    ronn --roff --pipe \
+        --manual="$(get_header "$1" header)" \
+        --name "$(get_header "$1" title)" \
+        --organization "$(get_header "$1" footer)" \
+        --section "$(get_header "$1" section)" > "$2"
diff -Nru android-platform-build-kati-10.0.0+r32/debian/rules android-platform-build-kati-10.0.0+r32/debian/rules
--- android-platform-build-kati-10.0.0+r32/debian/rules	2020-05-11 19:20:29.000000000 +0000
+++ android-platform-build-kati-10.0.0+r32/debian/rules	2020-05-12 07:20:55.000000000 +0000
@@ -5,9 +5,11 @@
 %:
 	dh $@
 
-override_dh_auto_build: debian/ckati.mk
+override_dh_auto_build: debian/ckati.mk debian/ckati.1
 	dh_auto_build --buildsystem=makefile -- --file=$<
-	pandoc debian/ckati.md -t man -s -o debian/ckati.1
+
+%.1: %.md
+	debian/md2man $< $@
 
 override_dh_auto_test:
 	-ruby runtest.rb -c -n -v