diff --git a/dev-util/cmark/cmark-0.26.1.recipe b/dev-util/cmark/cmark-0.26.1.recipe
index 2a485b63a..1bf8095ed 100644
--- a/dev-util/cmark/cmark-0.26.1.recipe
+++ b/dev-util/cmark/cmark-0.26.1.recipe
@@ -7,32 +7,44 @@ CommonMark documents to an abstract syntax tree (AST), manipulating the AST, \
 and rendering the document to HTML, groff man, LaTeX, CommonMark, or an XML \
 representation of the AST. It also provides a command-line program (cmark) \
 for parsing and rendering CommonMark documents."
-HOMEPAGE="https://github.com/jgm/cmark"
-COPYRIGHT="2014 John MacFarlane"
+HOMEPAGE="https://github.com/commonmark/cmark"
+COPYRIGHT="2014-2016 John MacFarlane"
 LICENSE="BSD (2-clause)"
-REVISION="1"
-SOURCE_URI="https://github.com/jgm/cmark/archive/$portVersion.tar.gz"
+REVISION="2"
+SOURCE_URI="https://github.com/commonmark/cmark/archive/$portVersion.tar.gz"
 CHECKSUM_SHA256="b50615a97f9c19e353d65f3bdbd6898ed1443a6f49e38f0aa888d5b58867f5d6"
+SOURCE_FILENAME="cmark-$portVersion.tar.gz"
 
-ARCHITECTURES="x86 !x86_gcc2 ?x86_64"
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
+commandSuffix=$secondaryArchSuffix
+commandBinDir=$binDir
+relativeCommandBinDir=$relativeBinDir
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandSuffix=
+	commandBinDir=$prefix/bin
+	relativeCommandBinDir=bin
+fi
+
 PROVIDES="
-	libcmark$secondaryArchSuffix = $portVersion compat >= 0
+	cmark$secondaryArchSuffix = $portVersion compat >= 0
 	lib:libcmark$secondaryArchSuffix = $portVersion compat >= 0
-	cmd:cmark$secondaryArchSuffix = $portVersion compat >= 0
-	cmd:api_test$secondaryArchSuffix = $portVersion compat >= 0
+	cmd:cmark$commandSuffix = $portVersion compat >= 0
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
 	"
+REPLACES="
+	libcmark$secondaryArchSuffix
+	"
 
 PROVIDES_devel="
-	libcmark${secondaryArchSuffix}_devel = $portVersion compat >= 0
+	cmark${secondaryArchSuffix}_devel = $portVersion compat >= 0
 	devel:libcmark$secondaryArchSuffix = $portVersion compat >= 0
 	"
 REQUIRES_devel="
-	libcmark$secondaryArchSuffix == $portVersion base
+	cmark$secondaryArchSuffix == $portVersion base
 	"
 
 BUILD_REQUIRES="
@@ -50,11 +62,25 @@ BUILD_PREREQUIRES="
 	cmd:python3
 	"
 
+PATCH()
+{
+	if [ "$relativeCommandBinDir" != bin ]; then
+		sed -i \
+			-e "s|\(RUNTIME DESTINATION\) bin|\1 $relativeCommandBinDir|;" \
+			src/CMakeLists.txt
+	fi
+	sed -i \
+		-e "s|\(DESTINATION\) include|\1 $relativeIncludeDir|;" \
+		src/CMakeLists.txt
+}
+
 BUILD()
 {
-	mkdir build
+	mkdir -p build
 	cd build
-	cmake .. $cmakeDirArgs
+	cmake .. $cmakeDirArgs \
+		-DLIB_INSTALL_DIR:PATH="$relativeLibDir" \
+
 	make $jobArgs
 }
 
@@ -67,10 +93,14 @@ INSTALL()
 
 	# devel package
 	packageEntries devel \
-		$developDir
+		"$developDir" \
+		"$libDir"/cmake \
+		"$manDir"/man3 \
+
 }
 
 TEST()
 {
+	LIBRARY_PATH="$sourceDir/build/src${LIBRARY_PATH:+:$LIBRARY_PATH}" \
 	make test
-}
\ No newline at end of file
+}