diff --git a/sci-mathematics/amath/amath-1.8.3.recipe b/sci-mathematics/amath/amath-1.8.5.recipe
similarity index 60%
rename from sci-mathematics/amath/amath-1.8.3.recipe
rename to sci-mathematics/amath/amath-1.8.5.recipe
index 371726144..8a868e324 100644
--- a/sci-mathematics/amath/amath-1.8.3.recipe
+++ b/sci-mathematics/amath/amath-1.8.5.recipe
@@ -4,14 +4,14 @@ IEEE 754 calculations with 15 significant digits, calculations with real and \
 complex numbers, variables and user defined functions, logarithmic and exponential \
 functions, trigonometric and hyperbolic function and selected mathematical \
 constants and rounding functions."
-HOMEPAGE="https://amath.innolan.net"
-COPYRIGHT="2014-2017 Carsten Sonne Larsen"
+HOMEPAGE="https://amath.innolan.net/"
+COPYRIGHT="2014-2018 Carsten Sonne Larsen"
 LICENSE="BSD (2-clause)"
 REVISION="1"
 SOURCE_URI="http://dist2.innolan.net/amath-$portVersion.tar.gz"
-CHECKSUM_SHA256="2bb005c96429eaf6cd61a7e774e4e2fc1cbf89a2137f68ae741cb8691623c574"
+CHECKSUM_SHA256="ed77eb2a367a7462a0d13dc7d2188deb7464f59c166bdc346c3abcd9c0a4e31c"
 
-ARCHITECTURES="x86 x86_gcc2"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
 
 PROVIDES="
 	amath = $portVersion
@@ -29,9 +29,16 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"
 
+if [ "$effectiveTargetArchitecture" = x86_gcc2 ]; then
+PATCH()
+{
+	sed -i -e 's/^\(gcclib="-lstdc++\)"$/\1.r4"/;' configure
+}
+fi
+
 BUILD()
 {
-	./configure --without-stdc++ LDFLAGS=-lbe
+	./configure LDFLAGS=-lbe
 	make static $jobArgs
 }
 
@@ -44,5 +51,6 @@ INSTALL()
 
 TEST()
 {
-	make test
+	LIBRARY_PATH="$sourceDir/src/lib:$sourceDir/src/cplex:$sourceDir/src/real:$sourceDir/src/clib${LIBRARY_PATH:+:$LIBRARY_PATH}" \
+	"$sourceDir"/amath --test
 }