diff --git a/config.mk.acr b/config.mk.acr
index dbe715b..053121b 100644
--- a/config.mk.acr
+++ b/config.mk.acr
@@ -20,11 +20,11 @@ SYSPROXY=@SYSPROXY@
 #CFLAGS+=-DVERSION=\"@VERSION@\"
 #CFLAGS+=-DLIL_ENDIAN=@LIL_ENDIAN@
 
-RADARE_LDFLAGS=@RADARE_LDFLAGS@ -lm
+RADARE_LIBS=@RADARE_LIBS@ -lm
 
 ##HAVE_LIB_EWF##
 RADARE_OBJ+=plug/io/ewf.o
-RADARE_LDFLAGS+=-lewf
+RADARE_LIBS+=-lewf
 ##HAVE_LIB_EWF##
 
 BINSFX=
@@ -48,7 +48,7 @@ SYSPROXY_OBJ+=syscall.o rpc.o syscall-linux.o
 ##SYSPROXY##
 
 ##SOLARIS##
-RADARE_LDFLAGS+=-lsocket
+RADARE_LIBS+=-lsocket
 ##SOLARIS##
 
 CPU=@TARGET_CPU@
diff --git a/configure b/configure
index e5fc8a9..3d91606 100755
--- a/configure
+++ b/configure
@@ -270,7 +270,7 @@ parse_options $1
 shift
 done
 
-ENVWORDS="MANDIR INFODIR LIBDIR INCLUDEDIR LOCALSTATEDIR SYSCONFDIR DATADIR LIBEXECDIR SBINDIR BINDIR EPREFIX PREFIX SPREFIX TARGET HOST BUILD INSTALL INSTALL_LIB INSTALL_MAN INSTALL_PROGRAM INSTALL_DIR INSTALL_SCRIPT INSTALL_DATA HOST_OS HOST_CPU BUILD_OS BUILD_CPU TARGET_OS TARGET_CPU PKGNAME VPATH VERSION CONTACT CONTACT_NAME CONTACT_MAIL CC CFLAGS LDFLAGS HAVE_LANG_C LIL_ENDIAN BIG_ENDIAN BYTEORDER HAVE_LIB_DL DL_LIBS SOLARIS DARWIN SHARED_EXT SHARED_CFLAGS WINDOWS READLINE HAVE_RL_COMPLETION_MATCHES RADARE_LDFLAGS HAVE_LIB_READLINE HAVE_USB_H USBSNF DEBUGGER JAVA WII W32 SYSPROXY RUBY RUBY_VERSION PYTHON HAVE_LANG_PYTHON HAVE_INSTALL VALA HAVE_VALAC VALAC HAVE_VALA_1_0_VERSION_0_5_0 _CFLAGS SIZEOF_OFF_T HAVE_LIB_EWF MAEMO HAVE_GUI HAVE_GTKDIALOG GTKDIALOG GTK_FLAGS GTK_LIBS HAVE_PKGCFG_GTK_2_0 VTE_FLAGS VTE_LIBS HAVE_PKGCFG_VTE HAVE_VALA LUA HAVE_LANG_LUA LUA_LIBS HAVE_LIB_LUA HAVE_LIB_LUA5_1"
+ENVWORDS="MANDIR INFODIR LIBDIR INCLUDEDIR LOCALSTATEDIR SYSCONFDIR DATADIR LIBEXECDIR SBINDIR BINDIR EPREFIX PREFIX SPREFIX TARGET HOST BUILD INSTALL INSTALL_LIB INSTALL_MAN INSTALL_PROGRAM INSTALL_DIR INSTALL_SCRIPT INSTALL_DATA HOST_OS HOST_CPU BUILD_OS BUILD_CPU TARGET_OS TARGET_CPU PKGNAME VPATH VERSION CONTACT CONTACT_NAME CONTACT_MAIL CC CFLAGS LDFLAGS HAVE_LANG_C LIL_ENDIAN BIG_ENDIAN BYTEORDER HAVE_LIB_DL DL_LIBS SOLARIS DARWIN SHARED_EXT SHARED_CFLAGS WINDOWS READLINE HAVE_RL_COMPLETION_MATCHES RADARE_LIBS HAVE_LIB_READLINE HAVE_USB_H USBSNF DEBUGGER JAVA WII W32 SYSPROXY RUBY RUBY_VERSION PYTHON HAVE_LANG_PYTHON HAVE_INSTALL VALA HAVE_VALAC VALAC HAVE_VALA_1_0_VERSION_0_5_0 _CFLAGS SIZEOF_OFF_T HAVE_LIB_EWF MAEMO HAVE_GUI HAVE_GTKDIALOG GTKDIALOG GTK_FLAGS GTK_LIBS HAVE_PKGCFG_GTK_2_0 VTE_FLAGS VTE_LIBS HAVE_PKGCFG_VTE HAVE_VALA LUA HAVE_LANG_LUA LUA_LIBS HAVE_LIB_LUA HAVE_LIB_LUA5_1"
 
 create_environ
 
@@ -361,16 +361,16 @@ if [ "$WINDOWS" = "1" ]; then
 export SHARED_EXT="dll"; fi
 printf "checking function rl_completion_matches() in readline... "
 echo "main(){ rl_completion_matches(0); }" > test.c
-${CC} ${CFLAGS} ${LDFLAGS} -lreadline test.c >/dev/null 2>&1
+${CC} ${CFLAGS} ${LDFLAGS} test.c -lreadline >/dev/null 2>&1
 if [ $? = 0 ]; then
 	echo yes ; HAVE_RL_COMPLETION_MATCHES=1
 else
 	HAVE_RL_COMPLETION_MATCHES=0 ; echo no ; fi
-export RADARE_LDFLAGS=""
+export RADARE_LIBS=""
 export HAVE_LIB_READLINE="0"
 if [ "$HAVE_RL_COMPLETION_MATCHES" = "1" ]; then
 export HAVE_LIB_READLINE="1"
-export RADARE_LDFLAGS="-lreadline"; fi
+export RADARE_LIBS="-lreadline"; fi
 if [ "$READLINE" = "0" ]; then
 export HAVE_LIB_READLINE="0"; fi
 check_include() {
diff --git a/configure.acr b/configure.acr
index 3644a5a..8d6c14b 100644
--- a/configure.acr
+++ b/configure.acr
@@ -27,11 +27,11 @@ IFEQ WINDOWS 1 ; {
 (( Check for the GNU readline library ))
 ARG_WITHOUT READLINE readline disables the readline support ;
 CHKFNC readline rl_completion_matches
-RADARE_LDFLAGS = '' ;
+RADARE_LIBS = '' ;
 HAVE_LIB_READLINE = 0 ;
 IF HAVE_RL_COMPLETION_MATCHES {
 	HAVE_LIB_READLINE = 1 ;
-        RADARE_LDFLAGS = -lreadline ;
+        RADARE_LIBS = -lreadline ;
 }
 IFNOT READLINE { HAVE_LIB_READLINE = 0 ; }
 
diff --git a/gui/Makefile b/gui/Makefile
index ace5687..c560b38 100644
--- a/gui/Makefile
+++ b/gui/Makefile
@@ -5,13 +5,13 @@ OBJ=main.o topbar.o toolbar.o actions.o execute.o prefs.o menubar.o dialog.o
 CFLAGS+=-DPREFIX=\"${PREFIX}\" -DGRSCDIR=\"${DATADIR}/radare/gradare\"
 CFLAGS+=${GTK_FLAGS} ${VTE_FLAGS}
 #`pkg-config glib-2.0 gtk+-2.0 vte --cflags`
-LDFLAGS+=${GTK_LIBS} ${VTE_LIBS}
+LIBS+=${GTK_LIBS} ${VTE_LIBS}
 CFLAGS+=-D_MAEMO_=${MAEMO}
 #`pkg-config glib-2.0 gtk+-2.0 vte --libs`
 # MAEMO STUFF
 ifeq ($(MAEMO),1)
 CFLAGS+=`pkg-config --cflags hildon-1`
-LDFLAGS+=`pkg-config --libs hildon-1`
+LIBS+=`pkg-config --libs hildon-1`
 endif
 
 
@@ -19,7 +19,7 @@ all: ${OBJ} ${BIN}
 	${E} 'Linking ${BIN}'
 
 ${BIN}:
-	${Q}${CC} ${CFLAGS} ${LDFLAGS} ${OBJ} -o ${BIN}
+	${Q}${CC} ${CFLAGS} ${LDFLAGS} ${OBJ} ${LIBS} -o ${BIN}
 
 ${OBJ}: %.o: %.c
 	${E} 'Compiling $<'
diff --git a/libusbsniff/Makefile b/libusbsniff/Makefile
index 7667516..c51737a 100644
--- a/libusbsniff/Makefile
+++ b/libusbsniff/Makefile
@@ -1,5 +1,5 @@
 include ../config.mk
-LDFLAGS+=${DL_LIBS}
+LIBS+=${DL_LIBS}
 
 .SUFFIXES: .c .o
 .c.o:
@@ -10,11 +10,11 @@ LDFLAGS+=${DL_LIBS}
 all: hexdump.o libfdsniff.${SHARED_EXT} libusbsniff.${SHARED_EXT}
 
 libfdsniff.${SHARED_EXT}: hexdump.o libfdsniff.o
-	-${Q}${CC} ${CFLAGS} ${LDFLAGS} ${SHARED_CFLAGS} hexdump.o libfdsniff.o -shared -fPIC -o libfdsniff.${SHARED_EXT} 2>/dev/null
+	-${Q}${CC} ${CFLAGS} ${LDFLAGS} ${SHARED_CFLAGS} hexdump.o libfdsniff.o ${LIBS} -shared -fPIC -o libfdsniff.${SHARED_EXT} 2>/dev/null
 
 libusbsniff.${SHARED_EXT}: hexdump.o libusbsniff.o
 ##USBSNF##
-	-${Q}${CC} ${CFLAGS} ${LDFLAGS} ${SHARED_CFLAGS} hexdump.o libusbsniff.o -shared -fPIC -o libusbsniff.${SHARED_EXT} 2>/dev/null
+	-${Q}${CC} ${CFLAGS} ${LDFLAGS} ${SHARED_CFLAGS} hexdump.o libusbsniff.o ${LIBS} -shared -fPIC -o libusbsniff.${SHARED_EXT} 2>/dev/null
 ##USBSNF##
 
 clean:
diff --git a/src/Makefile.acr b/src/Makefile.acr
index f46c733..80fcd87 100644
--- a/src/Makefile.acr
+++ b/src/Makefile.acr
@@ -37,13 +37,13 @@ CFLAGS+=-DSYSPROXY
 #CFLAGS+=-DHAVE_LIB_READLINE=${HAVE_LIB_READLINE} -DLIBEXECDIR=\"${LIBEXECDIR}\"
 #CFLAGS+=-DSIZEOF_OFF_T=${SIZEOF_OFF_T} -DDEBUGGER=${DEBUGGER} -DTARGET=\"${TARGET}\" -DRADARE_CORE -DHAVE_LIB_EWF=${HAVE_LIB_EWF}
 CFLAGS+=-DRADARE_CORE
-LDFLAGS+=${DL_LIBS} ${OSOLIBS}
+LIBS+=${DL_LIBS} ${OSOLIBS}
 
 OBJ+=grava.o
 ##VALA##
 ##HAVE_GUI##
 CFLAGS+=-I../vala/ `pkg-config --cflags gtk+-2.0` -DHAVE_GUI=1
-LDFLAGS+=`pkg-config --libs gtk+-2.0`
+LIBS+=`pkg-config --libs gtk+-2.0`
 OBJ2+=../vala/*.o
 TARGETS+=valagrava
 ##HAVE_GUI##
@@ -94,12 +94,12 @@ udis86:
 
 radare${BINSFX}: ${OBJ} ${OBJ2} main.o
 	${E} 'Linking radare'
-	${Q}${CC} ${RADARE_LDFLAGS} ${LDFLAGS} -o radare${BINSFX} main.o ${OBJ} ${OBJ2} ${W32LIBS}
+	${Q}${CC} ${LDFLAGS} -o radare${BINSFX} main.o ${OBJ} ${OBJ2} ${RADARE_LIBS} ${LIBS} ${W32LIBS}
 
 gui: ${OBJ}
 	${E} 'Compiling Vala GUI'
 	cd ../vala && ${MAKE} c
-	-${Q}${CC} ${RADARE_LDFLAGS} ${LDFLAGS} -o ravalagui${BINSFX} ../vala/*.o ${OBJ} ${OBJ2} ${W32LIBS} -lvte
+	-${Q}${CC} ${LDFLAGS} -o ravalagui${BINSFX} ../vala/*.o ${OBJ} ${OBJ2} ${RADARE_LIBS} ${LIBS}  ${W32LIBS} -lvte
 
 lsbstego${BINSFX}: lsbstego.o
 	${Q}${CC} lsbstego.o -g -o lsbstego${BINSFX}
@@ -127,12 +127,12 @@ _rahash:
 
 rax${BINSFX}: rax.o
 	${E} 'Linking rax'
-	${Q}${CC} ${CFLAGS} ${LDFLAGS} -o rax${BINSFX} rax.o
+	${Q}${CC} ${CFLAGS} rax.o ${LIBS} -o rax${BINSFX}
 	@#ln -fs radare rax # ???
 
 xrefs${BINSFX}: xrefs.o
 	${E} 'Linking xrefs'
-	${Q}${CC} ${CFLAGS} ${LDFLAGS} -o xrefs${BINSFX} xrefs.o
+	${Q}${CC} ${CFLAGS} ${LDFLAGS} xrefs.o ${LIBS} -o xrefs${BINSFX}
 
 clean:
 	${E} 'Cleaning src'
diff --git a/src/dbg/Makefile b/src/dbg/Makefile
index 54dfd46..a813abc 100644
--- a/src/dbg/Makefile
+++ b/src/dbg/Makefile
@@ -7,12 +7,12 @@ LIB=ptrace.${SHARED_EXT}
 #LIBPRE=libps2fd.so
 
 #all: ptrace.o ${OBJ}
-#	${CC} ${LDFLAGS} ptrace.o ${OBJ} -shared -o ${LIB}
+#	${CC} ${LDFLAGS} ptrace.o ${OBJ} ${LIBS} -shared -o ${LIB}
 
 all: ${OBJ}
 	@-${Q}echo [src/dbg] debugger layer build done
 
-#${CC} ${LDFLAGS} ${OBJ} ${SHARED_CFLAGS} -o ${LIB}
+#${CC} ${LDFLAGS} ${OBJ} ${LIBS} ${SHARED_CFLAGS} -o ${LIB}
 
 clean:
 	${E} '[src/dbg] Cleaning ...'
diff --git a/src/javasm/Makefile b/src/javasm/Makefile
index f36e5f3..1538fc3 100644
--- a/src/javasm/Makefile
+++ b/src/javasm/Makefile
@@ -7,7 +7,7 @@ all: ${BIN}
 	@echo done
 
 ${BIN}: ${OBJ}
-	${CC} ${OBJ} ${LDFLAGS} -o ${BIN}
+	${CC} ${LDFLAGS} ${OBJ} ${LIBS} -o ${BIN}
 
 clean:
 	-rm -f ${BIN} ${OBJ}
diff --git a/src/plug/hack/Makefile b/src/plug/hack/Makefile
index 0325a1f..96b7490 100644
--- a/src/plug/hack/Makefile
+++ b/src/plug/hack/Makefile
@@ -1,15 +1,15 @@
 include ../../../config.mk
 
 # NOTE: umf..-lncurses is only needed on debian?
-	#-${CC} perl.c ${CFLAGS}˘${HARED_CFLAGS}${PERL_CFLAGS} ${PERL_LDFLAGS} -o perl.${SHARED_EXT}
+	#-${CC} perl.c ${CFLAGS}˘${HARED_CFLAGS}${PERL_CFLAGS} ${PERL_LIBS} -o perl.${SHARED_EXT}
 PERL_CFLAGS=`perl -MExtUtils::Embed -e ccopts`
-PERL_LDFLAGS=`perl -MExtUtils::Embed -e ldopts` -lncurses
+PERL_LIBS=`perl -MExtUtils::Embed -e ldopts` -lncurses
 PY_CFLAGS=-I${PREFIX}/include/python2.5/ -I/usr/include/python2.5/
-PY_LDFLAGS=-lpython2.5
+PY_LIBS=-lpython2.5
 LUA_CFLAGS=-I${PREFIX}/include/lua5.1/ -I/usr/include/lua5.1/
 LUA_LDFLAGS=
 RUBY_CFLAGS=-I/usr/lib/ruby/1.8/i386-linux
-RUBY_LDFLAGS=-lruby18
+RUBY_LIBS=-lruby18
 SO=${SHARED_EXT}
 CFLAGS+=${LUA_CFLAGS} ${PY_CFLAGS}
 
@@ -37,14 +37,14 @@ scriptedit.${SO}:
 	-${CC} `pkg-config gtk+-2.0 --cflags --libs` scriptedit.c -I ../.. -fPIC -shared -g -o scriptedit.${SO}
 
 python.${SO}:
-	-${CC} python.c ${SHARED_CFLAGS} ${LDFLAGS} ${CFLAGS} ${PY_CFLAGS} ${PY_LDFLAGS} -o python.${SO}
+	-${CC} python.c ${SHARED_CFLAGS} ${LDFLAGS} ${CFLAGS} ${PY_CFLAGS} ${PY_LIBS} -o python.${SO}
 
 perl.${SO}:
-	-${CC} perl.c ${SHARED_CFLAGS} ${CFLAGS} ${PERL_CFLAGS} ${PERL_LDFLAGS} -o perl.${SO}
+	-${CC} perl.c ${SHARED_CFLAGS} ${CFLAGS} ${PERL_CFLAGS} ${PERL_LIBS} -o perl.${SO}
 
 ruby.${SO}:
 	-ruby mkruby.rb
-	#-${CC} ruby.c ${SHARED_CFLAGS} ${CFLAGS} ${RUBY_CFLAGS} ${RUBY_LDFLAGS} -o ruby.${SO}
+	#-${CC} ruby.c ${SHARED_CFLAGS} ${CFLAGS} ${RUBY_CFLAGS} ${RUBY_LIBS} -o ruby.${SO}
 
 # Try with -llua and -llua5.1 (stupid ubuntu)
 lua.${SO}:
diff --git a/src/radiff/Makefile b/src/radiff/Makefile
index f717f63..02fcdd6 100644
--- a/src/radiff/Makefile
+++ b/src/radiff/Makefile
@@ -8,13 +8,13 @@ CFLAGS+=-I..
 
 
 all: ${OBJ} _bdiff rdbdiff$(BINSFX)
-	${CC} ${CFLAGS} ${LDFLAGS} ${OBJ} -o ${BIN}
+	${CC} ${CFLAGS} ${LDFLAGS} ${OBJ} ${LIBS} -o ${BIN}
 
 _bdiff:
 	-cd bdiff && ${MAKE} all
 
 rdbdiff${BINSFX}: ${OBJ_RDB}
-	${CC} ${LDFLAGS} -g ${OBJ_RDB} -o rdbdiff${BINSFX}
+	${CC} ${LDFLAGS} -g ${OBJ_RDB} ${LIBS} -o rdbdiff${BINSFX}
 
 clean:
 	cd bdiff && ${MAKE} clean
diff --git a/src/rahash/Makefile b/src/rahash/Makefile
index a164789..c7bbbfa 100644
--- a/src/rahash/Makefile
+++ b/src/rahash/Makefile
@@ -1,12 +1,12 @@
 include ../../config.mk
-LDFLAGS=-lm
+LIBS=-lm
 HASH_OBJ=rahash.o md4.o md5c.o crc16.o crc32.o sha1.o hash.o hamdist.o entropy.o sha2.o ../w32utils.o
 HASH_BIN=rahash${BINSFX}
 
 all: ${HASH_OBJ} rahash${BINSFX}
 
 rahash${BINSFX}:
-	${CC} ${CFLAGS} ${LDFLAGS} -o ${HASH_BIN} ${HASH_OBJ} 
+	${CC} ${CFLAGS} ${LDFLAGS} ${HASH_OBJ} ${LIBS} -o ${HASH_BIN}
 
 clean:
 	-rm -rf ${HASH_BIN} ${HASH_OBJ} a.out a.exe
diff --git a/src/rasc/Makefile b/src/rasc/Makefile
index 5cbde66..c9c797d 100644
--- a/src/rasc/Makefile
+++ b/src/rasc/Makefile
@@ -7,7 +7,7 @@ OBJ2=test_sp.o rpc.o syscall-linux.o sysproxy.o
 
 all: ${OBJ}
 	${E} 'Linking rasc'
-	${Q}${CC} -o rasc${BINSFX} ${OSOLIBS} ${LDFLAGS} ${OBJ}
+	${Q}${CC} ${LDFLAGS} -o rasc${BINSFX} ${OSOLIBS} ${LIBS} ${OBJ}
 
 ${OBJ}: %.o: %.c
 	${E} 'Compiling $<'
diff --git a/src/swig/Makefile b/src/swig/Makefile
index 4e83447..88ad815 100644
--- a/src/swig/Makefile
+++ b/src/swig/Makefile
@@ -1,8 +1,8 @@
-PY_LDFLAGS+=-lpython2.4
+PY_LIBS+=-lpython2.4
 PY_CFLAGS=-I/usr/include/python2.4/
 PL_CFLAGS+=`perl -MExtUtils::Embed -e ccopts`
 # NOTE: umf..-lncurses is only needed on debian?
-PL_LDFLAGS+=`perl -MExtUtils::Embed -e ldopts` -lncurses
+PL_LIBS+=`perl -MExtUtils::Embed -e ldopts` -lncurses
 obj=main.o radare.o radare_wrap.o
 
 all: perl python
@@ -11,15 +11,15 @@ all: perl python
 perl:
 	-rm radare_wrap.c
 	swig -perl5 radare.i
-	gcc -o pl radare_wrap.c radare.c main-perl.c ${PL_CFLAGS} ${PL_LDFLAGS} -lperl
+	gcc -o pl radare_wrap.c radare.c main-perl.c ${PL_CFLAGS} ${PL_LIBS} -lperl
 	-perl test.pl
-	#gcc ${obj} ${PL_CFLAGS} ${PL_LDFLAGS}
+	#gcc ${obj} ${PL_CFLAGS} ${PL_LIBS}
 
 python:
 	-rm radare_wrap.c
 	-rm -rf build
 	python build.py build
-	gcc -o py radare_wrap.c radare.c main.c ${PY_CFLAGS} ${PY_LDFLAGS}
+	gcc -o py radare_wrap.c radare.c main.c ${PY_CFLAGS} ${PY_LIBS}
 
 radare_wrap.o:
 	${CC} ${CFLAGS} -c radare_wrap.c