diff --git a/media-gfx/noteshrink/noteshrink-0.1.1.recipe b/media-gfx/noteshrink/noteshrink-0.1.1.recipe
index c70ff74f1..d2535aee4 100644
--- a/media-gfx/noteshrink/noteshrink-0.1.1.recipe
+++ b/media-gfx/noteshrink/noteshrink-0.1.1.recipe
@@ -1,14 +1,13 @@
 SUMMARY="Convert scans of handwritten notes to beautiful, compact PDFs"
 DESCRIPTION="Noteshrink is an utility that is used to convert scans of notes to compact PDFs."
-HOMEPAGE="https://github.com/mzucker/noteshrink"
+HOMEPAGE="https://mzucker.github.io/2016/09/20/noteshrink.html"
 COPYRIGHT="2016 Matt Zucker"
 LICENSE="MIT"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://github.com/mzucker/noteshrink/archive/$portVersion.tar.gz"
 CHECKSUM_SHA256="2a29c09768973e688b693b61337c6c49384e8123cf88824dba335cc8c4ed2ca8"
 
-ARCHITECTURES="!any"
-# Doesn't work on gcc2hybrid - missing dependencies.
+ARCHITECTURES="any"
 
 PROVIDES="
 	noteshrink = $portVersion
@@ -16,15 +15,38 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku
-	imagemagick
-	numpy_python >= 1.10
-	pillow_python
-	scipy_python
-	setuptools_python
+	numpy_python310
+	pillow_python310
+	scipy_python310
+	# These are optional:
+	# cmd:pngcrush
+	# cmd:pngquant
+	# cmd:optipng
+	cmd:convert # Deprecated in IMv7. imagemagick wants to be called "magick" now.
+	cmd:python3
+	"
+
+TEST_REQUIRES="
+	numpy_python310
+	pillow_python310
+	scipy_python310
+	cmd:convert
+	cmd:make
+	cmd:optipng
 	"
 
 INSTALL()
 {
 	mkdir -p $binDir
-	cp noteshrink.py $binDir/noteshrink
+	sed 's|#!/usr/bin/env python|#!/bin/python3|' noteshrink.py > $binDir/noteshrink
+}
+
+
+TEST()
+{
+	# As tests, let it convert the examples. Should create the following PDFs:
+	# "graph-paper-ink-only.pdf", "notesA.pdf", "notesB.pdf", and "tree.pdf",
+	# along with some left-over ".png"s.
+	rm -f example_output/*
+	make
 }