diff --git a/dev-util/cram/cram-0.7.recipe b/dev-util/cram/cram-0.7.recipe
new file mode 100644
index 000000000..b933c5ad8
--- /dev/null
+++ b/dev-util/cram/cram-0.7.recipe
@@ -0,0 +1,65 @@
+SUMMARY="Functional testing framework for command line applications"
+DESCRIPTION="Cram is a functional testing framework for command line \
+applications. Cram tests look like snippets of interactive shell sessions. \
+Cram runs each command and compares the command output in the test with \
+the command's actual output."
+HOMEPAGE="https://bitheap.org/cram/"
+COPYRIGHT="2010-2016 Rafael G. Martins"
+LICENSE="GNU GPL v2"
+REVISION="1"
+SOURCE_URI="https://bitheap.org/cram/cram-$portVersion.tar.gz"
+CHECKSUM_SHA256="7da7445af2ce15b90aad5ec4792f857cef5786d71f14377e9eb994d8b8337f2f"
+
+ARCHITECTURES="any"
+
+PROVIDES="
+	$portName = $portVersion
+	"
+REQUIRES="
+	haiku
+	"
+
+BUILD_REQUIRES="
+	haiku_devel
+	"
+
+PYTHON_PACKAGES=(python python3)
+PYTHON_VERSIONS=(2.7 3.6)
+for i in "${!PYTHON_PACKAGES[@]}"; do
+pythonPackage=${PYTHON_PACKAGES[i]}
+pythonVersion=${PYTHON_VERSIONS[$i]}
+eval "PROVIDES_${pythonPackage}=\"\
+	${portName}_$pythonPackage = $portVersion\n\
+	cmd:${portName}${pythonVersion%%.*} = $portVersion\
+	\"; \
+REQUIRES_$pythonPackage=\"\
+	haiku\n\
+	cmd:python$pythonVersion\
+	\""
+BUILD_REQUIRES="$BUILD_REQUIRES
+	setuptools_$pythonPackage"
+BUILD_PREREQUIRES="$BUILD_PREREQUIRES
+	cmd:python$pythonVersion"
+done
+
+INSTALL()
+{
+	for i in "${!PYTHON_PACKAGES[@]}"; do
+		pythonPackage=${PYTHON_PACKAGES[i]}
+		pythonVersion=${PYTHON_VERSIONS[$i]}
+
+		python=python$pythonVersion
+		installLocation=$prefix/lib/$python/vendor-packages/
+		export PYTHONPATH=$installLocation:$PYTHONPATH
+		mkdir -p $installLocation
+		rm -rf build
+		$python setup.py build install \
+			--root=/ --prefix=$prefix
+
+		mv $prefix/bin/cram $prefix/bin/cram${pythonVersion%%.*}
+
+		packageEntries  $pythonPackage \
+			$prefix/bin \
+			$prefix/lib/python*
+	done
+}
diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-2.1.0.recipe b/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0.recipe
similarity index 86%
rename from sys-apps/the_silver_searcher/the_silver_searcher-2.1.0.recipe
rename to sys-apps/the_silver_searcher/the_silver_searcher-2.2.0.recipe
index b2b1646b3..c7cd17638 100644
--- a/sys-apps/the_silver_searcher/the_silver_searcher-2.1.0.recipe
+++ b/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0.recipe
@@ -8,11 +8,12 @@ their patterns to a .agignore file.
 * Ag uses Pthreads to take advantage of multiple CPU cores and search files in \
 parallel."
 HOMEPAGE="https://github.com/ggreer/the_silver_searcher/"
-COPYRIGHT="2013-2017 Geoff Greer"
+COPYRIGHT="2013-2018 Geoff Greer"
 LICENSE="Apache v2"
 REVISION="1"
 SOURCE_URI="https://github.com/ggreer/the_silver_searcher/archive/$portVersion.tar.gz"
-CHECKSUM_SHA256="cb416a0da7fe354a009c482ae709692ed567f8e7d2dad4d242e726dd7ca202f0"
+CHECKSUM_SHA256="6a0a19ca5e73b2bef9481c29a508d2413ca1a0a9a5a6b1bd9bbd695a7626cbf9"
+SOURCE_FILENAME="the_silver_searcher-$portVersion.tar.gz"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
@@ -47,11 +48,17 @@ BUILD_PREREQUIRES="
 	cmd:autoconf
 	cmd:autoheader
 	cmd:automake
+	cmd:clang_format
 	cmd:make
 	cmd:gcc$secondaryArchSuffix
 	cmd:pkg_config$secondaryArchSuffix
 	"
 
+TEST_REQUIRES="
+	cmd:cram2
+	cmd:git
+	"
+
 BUILD()
 {
 	aclocal
@@ -65,6 +72,9 @@ BUILD()
 	# Build fix, remove if solved
 	sed --in-place '/HAVE_FOPENCOOKIE/d' src/config.h
 
+	# Test fix
+	sed -i 's/cram/cram2/g' Makefile
+
 	make $jobArgs
 }
 
@@ -75,5 +85,5 @@ INSTALL()
 
 TEST()
 {
-	make check
+	make test
 }