diff --git a/app-crypt/rhash/rhash-1.3.5.recipe b/app-crypt/rhash/rhash-1.3.6.recipe
similarity index 76%
rename from app-crypt/rhash/rhash-1.3.5.recipe
rename to app-crypt/rhash/rhash-1.3.6.recipe
index dea49c80b..0775cd403 100644
--- a/app-crypt/rhash/rhash-1.3.5.recipe
+++ b/app-crypt/rhash/rhash-1.3.6.recipe
@@ -7,11 +7,11 @@ Hash sums are used to ensure and verify integrity of large volumes of data for\
  a long-term storing or transferring.
 "
 HOMEPAGE="http://rhash.anz.ru/?l=en"
-COPYRIGHT="2005-2014 Aleksey Kravchenko"
+COPYRIGHT="2005-2018 Aleksey Kravchenko"
 LICENSE="MIT"
 REVISION="1"
 SOURCE_URI="https://downloads.sourceforge.net/rhash/rhash-$portVersion-src.tar.gz"
-CHECKSUM_SHA256="98e0688acae29e68c298ffbcdbb0f838864105f9b2bd8857980664435b1f1f2e"
+CHECKSUM_SHA256="964df972b60569b5cb35ec989ced195ab8ea514fc46a74eab98e86569ffbcf92"
 SOURCE_DIR="RHash-$portVersion"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
@@ -24,6 +24,15 @@ if [ "$targetArchitecture" = x86_gcc2 ]; then
 	commandBinDir=$prefix/bin
 fi
 
+if [ -z "$commandSuffix" ]; then
+GLOBAL_WRITABLE_FILES="
+	settings/rhashrc keep-old
+	"
+USER_SETTINGS_FILES="
+	settings/rhashrc
+	"
+fi
+
 PROVIDES="
 	rhash$secondaryArchSuffix = $portVersion
 	lib:librhash$secondaryArchSuffix = 0
@@ -34,6 +43,8 @@ REQUIRES="
 
 RHASH_BIN="
 	cmd:ed2k_link$commandSuffix = $portVersion
+	cmd:edonr256_hash$commandSuffix = $portVersion
+	cmd:edonr512_hash$commandSuffix = $portVersion
 	cmd:gost_hash$commandSuffix = $portVersion
 	cmd:has160_hash$commandSuffix = $portVersion
 	cmd:magnet_link$commandSuffix = $portVersion
@@ -79,25 +90,29 @@ BUILD_PREREQUIRES="
 
 BUILD()
 {
-	make build-shared $jobArgs
+	INSTALL_INCDIR="$includeDir" \
+	./configure --prefix="$prefix" --bindir="$commandBinDir" \
+		--libdir="$libDir" --localedir="$dataDir"/locale --mandir="$manDir" \
+		--sysconfdir="$sysconfDir"
+	make $jobArgs
 }
 
 INSTALL()
 {
-	make PREFIX=$prefix BINDIR=$commandBinDir MANDIR=$manDir \
-		LOCALEDIR=$dataDir/locale install-shared
-	make -C librhash PREFIX=$prefix INCDIR=$includeDir LIBDIR=$libDir \
-		install-headers install-lib-shared install-so-link
+	make install install-pkg-config
+	make -C librhash install-headers
 
 	prepareInstalledDevelLib librhash
+	fixPkgconfig
 
 	packageEntries devel \
-		$developDir
+		"$developDir"
 
 	if [ -n "$commandSuffix" ]; then
 		packageEntries bin \
 			"$commandBinDir" \
 			"$manDir"
+		rm "$settingsDir"/rhashrc
 	fi
 }
 
@@ -105,5 +120,5 @@ TEST()
 {
 	cd tests
 	LIBRARY_PATH="$sourceDir/librhash${LIBRARY_PATH:+:$LIBRARY_PATH}" \
-		./test_rhash.sh --full ../rhash_shared
+		./test_rhash.sh --full ../rhash
 }