diff --git a/dev-embedded/avrdude/avrdude-6.3.recipe b/dev-embedded/avrdude/avrdude-6.3.recipe
index 6e06bc89f..5817469d4 100644
--- a/dev-embedded/avrdude/avrdude-6.3.recipe
+++ b/dev-embedded/avrdude/avrdude-6.3.recipe
@@ -5,7 +5,7 @@ technique (ISP)."
 HOMEPAGE="http://www.nongnu.org/avrdude/"
 COPYRIGHT="2003-2016 Brian S. Dean"
 LICENSE="GNU GPL v2"
-REVISION="4"
+REVISION="5"
 SOURCE_URI="http://download.savannah.gnu.org/releases/avrdude/avrdude-$portVersion.tar.gz"
 CHECKSUM_SHA256="0f9f731b6394ca7795b88359689a7fa1fba818c6e1d962513eb28da670e0a196"
 PATCHES="avrdude-$portVersion.patchset"
@@ -13,19 +13,31 @@ PATCHES="avrdude-$portVersion.patchset"
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
+commandSuffix=$secondaryArchSuffix
+commandBinDir=$binDir
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandSuffix=
+	commandBinDir=$prefix/bin
+fi
+
+libVersion="1.0.0"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
 GLOBAL_WRITABLE_FILES="
 	settings/avrdude.conf keep-old
 	"
 
 PROVIDES="
 	avrdude$secondaryArchSuffix = $portVersion
-	cmd:avrdude = $portVersion
-	lib:libavrdude$secondaryArchSuffix = $portVersion
+	cmd:avrdude$commandSuffix = $portVersion
+	lib:libavrdude$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libelf$secondaryArchSuffix
 	lib:libftdi1$secondaryArchSuffix
+	lib:libncurses$secondaryArchSuffix
+	lib:libreadline$secondaryArchSuffix
 	lib:libusb_1.0$secondaryArchSuffix
 	lib:libusb_0.1$secondaryArchSuffix
 	"
@@ -34,6 +46,8 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libelf$secondaryArchSuffix
 	devel:libftdi1$secondaryArchSuffix
+	devel:libncurses$secondaryArchSuffix
+	devel:libreadline$secondaryArchSuffix
 	devel:libusb_1.0$secondaryArchSuffix
 	devel:libusb_0.1$secondaryArchSuffix
 	"
@@ -43,7 +57,7 @@ BUILD_PREREQUIRES="
 	cmd:flex
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
-	cmd:libtool
+	cmd:libtool$secondaryArchSuffix
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
 	cmd:yacc
@@ -51,13 +65,8 @@ BUILD_PREREQUIRES="
 
 BUILD()
 {
-	autoreconf -fi
-	libtoolize --force --copy --install
-	if [ -n "$secondaryArchSuffix" ]; then
-		export PKG_CONFIG_LIBDIR=/system/$relativeDevelopLibDir/pkgconfig/
-	fi
-	automake --add-missing
-	runConfigure --omit-dirs bindir ./configure --bindir=$prefix/bin
+	autoreconf -vfi
+	runConfigure --omit-dirs bindir ./configure --bindir=$commandBinDir
 	make $jobArgs
 }