diff --git a/sys-devel/binutils/binutils-2.17_2013_04_21.recipe b/sys-devel/binutils/binutils-2.17_2013_04_21.recipe
index c452f678c..bf82a13fb 100644
--- a/sys-devel/binutils/binutils-2.17_2013_04_21.recipe
+++ b/sys-devel/binutils/binutils-2.17_2013_04_21.recipe
@@ -1,6 +1,9 @@
 SUMMARY="The GNU assembler, linker and binary utilities"
 HOMEPAGE="http://www.gnu.org/software/binutils"
-SOURCE_URI="https://github.com/haiku/buildtools/archive/ab0f66e995971d3e7c6c123daaab860378c5bbb1.tar.gz"
+commit="ab0f66e995971d3e7c6c123daaab860378c5bbb1"
+SOURCE_URI="https://github.com/haiku/buildtools/archive/$commit.tar.gz"
+SOURCE_FILENAME="$portName-$portVersion.tar.gz"
+SOURCE_DIR="buildtools-$commit/legacy/binutils"
 REVISION="2"
 LICENSE="
 	GNU GPL v2
@@ -48,7 +51,6 @@ BUILD_PREREQUIRES="
 	cmd:xargs
 	"
 
-SOURCE_DIR="binutils-$portVersion/legacy/binutils"
 CHECKSUM_SHA256="aa27149677e4cfb54458c0d910a68cf32aa4aa6129a2a39ee57aca1c0584072b"
 BUILD_PACKAGE_ACTIVATION_PHASE=INSTALL