diff --git a/dev/libs/elfutils/ympbuild b/dev/libs/elfutils/ympbuild
index 3c5bcfd3..5d1457fd 100644
--- a/dev/libs/elfutils/ympbuild
+++ b/dev/libs/elfutils/ympbuild
@@ -17,7 +17,6 @@ arch=('x86_64')
 group=(dev.libs)
 bzip2_depends=(bzip2)
 lzma_depends=(xz-utils)
-nls_depends=(gettext)
 zstd_depends=(zstd)
 
 cd $name-$version
diff --git a/dev/libs/musl/ympbuild b/dev/libs/musl/ympbuild
index c49e97f1..e73855ab 100644
--- a/dev/libs/musl/ympbuild
+++ b/dev/libs/musl/ympbuild
@@ -2,12 +2,12 @@
 name='musl'
 release='1'
 version='1.2.3'
-url='https://example.org'
+url='https://musl.libc.org/'
 description='the musl c library (libc) implementation'
 email=' aliriza.keskin@pardus.org.tr'
 maintainer=' aliriza'
 license=('MIT')
-source=('https://musl.libc.org/releases/musl-1.2.3.tar.gz'
+source=("https://musl.libc.org/releases/musl-$version.tar.gz"
         'ldconfig')
 depends=( )
 makedepends=( )
diff --git a/sys/devel/binutils/ympbuild b/sys/devel/binutils/ympbuild
index 26b5a476..1cba478d 100644
--- a/sys/devel/binutils/ympbuild
+++ b/sys/devel/binutils/ympbuild
@@ -7,13 +7,16 @@ description='A set of programs to assemble and manipulate binary and object file
 email=' aliriza.keskin@pardus.org.tr'
 maintainer=' aliriza'
 license=('GPLv3')
-source=('https://ftp.gnu.org/gnu/binutils/binutils-2.39.tar.xz')
+source=("https://ftp.gnu.org/gnu/binutils/binutils-$version.tar.xz")
 depends=(zlib)
 makedepends=( )
 md5sums=('f7e986ae9ff06405cafb2e585ee36d27')
 arch=('x86_64')
 group=(sys.devel)
 
+unset CFLAGS
+unset CXXFLAGS
+
 cd $name-$version
 
 setup(){
@@ -33,7 +36,6 @@ setup(){
         --enable-plugins \
         --enable-relro \
         --enable-shared \
-        --enable-targets=all \
         --enable-threads \
         --disable-gdb \
         --disable-gdbserver \
diff --git a/sys/devel/gettext/ympbuild b/sys/devel/gettext/ympbuild
index 777ee258..5c4093ce 100644
--- a/sys/devel/gettext/ympbuild
+++ b/sys/devel/gettext/ympbuild
@@ -21,16 +21,16 @@ cd $name-$version
 setup(){
     ./configure --prefix=/usr \
         --libdir=/usr/lib64 \
-	--enable-shared \
-	--enable-static \
-	--disable-java \
-	--without-emacs \
-	--without-cvs \
-	--without-included-regex \
-	--without-included-libxml \
+        --enable-shared \
+        --enable-static \
+        --disable-java \
+        --without-emacs \
+        --without-cvs \
+        --without-included-regex \
+        --without-included-libxml \
         --without-git \
-	$(use_opt bzip2 --with-bzip2 --without-bzip2) \
-	$(use_opt lzma --with-xz --without-xz)
+        $(use_opt bzip2 --with-bzip2 --without-bzip2) \
+        $(use_opt lzma --with-xz --without-xz)
 }
 
 build(){