diff --git a/sys-libs/gdbm/gdbm-1.13.recipe b/sys-libs/gdbm/gdbm-1.23.recipe
similarity index 54%
rename from sys-libs/gdbm/gdbm-1.13.recipe
rename to sys-libs/gdbm/gdbm-1.23.recipe
index 929b11e91..299695b49 100644
--- a/sys-libs/gdbm/gdbm-1.13.recipe
+++ b/sys-libs/gdbm/gdbm-1.23.recipe
@@ -6,27 +6,44 @@ dbm and ndbm calls."
 HOMEPAGE="https://www.gnu.org.ua/software/gdbm/"
 COPYRIGHT="2011, 2016-2017 Free Software Foundation, Inc."
 LICENSE="GNU GPL v3"
-REVISION="4"
+REVISION="1"
 SOURCE_URI="ftp://ftp.gnu.org/gnu/gdbm/gdbm-$portVersion.tar.gz"
-CHECKSUM_SHA256="9d252cbd7d793f7b12bcceaddda98d257c14f4d1890d851c386c37207000a253"
+CHECKSUM_SHA256="74b1081d21fff13ae4bd7c16e5d6e504a4c26f7cde1dca0d963a484174bbcacd"
 
-ARCHITECTURES="all"
+ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
 
-libVersion="4.0.0"
-libVersionCompat="$libVersion compat >= 4"
+commandBinDir=$binDir
+commandSuffix=$secondaryArchSuffix
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandSuffix=
+	commandBinDir=$prefix/bin
+fi
+
+libVersion="6.0.0"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+libVersion_compat="4.0.0"
+libVersionCompat_compat="$libVersion_compat compat >= ${libVersion_compat%%.*}"
 
 PROVIDES="
 	gdbm$secondaryArchSuffix = $portVersion
-	cmd:gdbm_dump$secondaryArchSuffix
-	cmd:gdbm_load$secondaryArchSuffix
-	cmd:gdbmtool$secondaryArchSuffix
 	lib:libgdbm$secondaryArchSuffix = $libVersionCompat
-	lib:libgdbm_compat$secondaryArchSuffix = $libVersionCompat
+	lib:libgdbm_compat$secondaryArchSuffix = $libVersionCompat_compat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-	lib:libiconv$secondaryArchSuffix
+	lib:libintl$secondaryArchSuffix
+	"
+
+PROVIDES_tools="
+	gdbm${secondaryArchSuffix}_tools
+	cmd:gdbm_dump$commandSuffix
+	cmd:gdbm_load$commandSuffix
+	cmd:gdbmtool$commandSuffix
+	"
+REQUIRES_tools="
+	gdbm$secondaryArchSuffix == $portVersion base
+	haiku$secondaryArchSuffix
 	lib:libintl$secondaryArchSuffix
 	lib:libncurses$secondaryArchSuffix
 	lib:libreadline$secondaryArchSuffix
@@ -34,8 +51,8 @@ REQUIRES="
 
 PROVIDES_devel="
 	gdbm${secondaryArchSuffix}_devel = $portVersion
-	devel:libgdbm$secondaryArchSuffix = $libVersion
-	devel:libgdbm_compat$secondaryArchSuffix = $libVersion
+	devel:libgdbm$secondaryArchSuffix = $libVersionCompat
+	devel:libgdbm_compat$secondaryArchSuffix = $libVersionCompat_compat
 	"
 REQUIRES_devel="
 	gdbm$secondaryArchSuffix == $portVersion base
@@ -58,16 +75,19 @@ BUILD_PREREQUIRES="
 	"
 
 defineDebugInfoPackage gdbm$secondaryArchSuffix  \
-	$binDir/gdbm_dump \
-	$binDir/gdbm_load \
-	$binDir/gdbmtool \
+	"$(getPackagePrefix tools)"/bin/gdbm_dump \
+	"$(getPackagePrefix tools)"/bin/gdbm_load \
+	"$(getPackagePrefix tools)"/bin/gdbmtool \
 	$libDir/libgdbm.so.$libVersion \
-	$libDir/libgdbm_compat.so.$libVersion
+	$libDir/libgdbm_compat.so.$libVersion_compat
 
 BUILD()
 {
 	autoreconf -vfi
-	runConfigure ./configure --enable-libgdbm-compat
+	runConfigure  --omit-dirs binDir ./configure \
+		--bindir=$commandBinDir \
+		--enable-libgdbm-compat \
+		--disable-static
 	make $jobArgs
 }
 
@@ -81,19 +101,14 @@ INSTALL()
 	# prepare develop/lib
 	prepareInstalledDevelLibs libgdbm libgdbm_compat
 
-	if [ -n "$secondaryArchSuffix" ]; then
-		rm -rf $manDir
-		maybe_manDir=
-	else
-		maybe_manDir=$manDir
-	fi
-
 	# devel package
 	packageEntries devel \
-		$developDir \
-		$maybe_manDir
+		$developDir
 
-	rm -r $documentationDir
+	# tools package
+	packageEntries tools \
+		$commandBinDir \
+		$manDir
 }
 
 TEST()