diff --git a/sflphone-client-kde/cmake/FindKabc.cmake b/sflphone-client-kde/cmake/FindKabc.cmake
index 59405f2f711cfe9294445382663bc1866818f4dd..ab3431d1105a53fb054c6bc64189660c8df4a775 100644
--- a/sflphone-client-kde/cmake/FindKabc.cmake
+++ b/sflphone-client-kde/cmake/FindKabc.cmake
@@ -1,5 +1,5 @@
 FIND_LIBRARY(KABC_LIBRARY NAMES kabc)
-FIND_PATH(KABC_INCLUDE_DIR kabc_export.h /usr/include/kabc /usr/local/include/kabc )
+FIND_PATH(KABC_INCLUDE_DIR kabc_export.h /usr/include/kabc /usr/local/include/kabc $ENV{KDEDIR}/include/kabc )
 
 
 IF (KABC_INCLUDE_DIR AND KABC_LIBRARY)
diff --git a/sflphone-common/libs/pjproject/build/os-auto.mak b/sflphone-common/libs/pjproject/build/os-auto.mak
index 6fa43bda1b515dc5e4392a211e5d3a06d5814b3d..62fa86b5c3682dcc2b18a5a8d2d5c3edca5d82dd 100644
--- a/sflphone-common/libs/pjproject/build/os-auto.mak
+++ b/sflphone-common/libs/pjproject/build/os-auto.mak
@@ -4,7 +4,7 @@ export OS_CFLAGS   := $(CC_DEF)PJ_AUTOCONF=1 -O2
 
 export OS_CXXFLAGS := $(CC_DEF)PJ_AUTOCONF=1 -O2 
 
-export OS_LDFLAGS  :=  -lm -luuid -lnsl -lrt -lpthread  -lasound -lssl -lcrypto
+export OS_LDFLAGS  :=  -lm -lnsl -lrt -lpthread  -lasound -lssl -lcrypto
 
 export OS_SOURCES  := 
 
diff --git a/sflphone-common/libs/pjproject/config.guess b/sflphone-common/libs/pjproject/config.guess
index f42b0a5a40bce9574720756960dac396d7d88e01..e019d6cb603867018bce360497c9a8dac8a764de 120000
--- a/sflphone-common/libs/pjproject/config.guess
+++ b/sflphone-common/libs/pjproject/config.guess
@@ -1 +1 @@
-/usr/share/misc/config.guess
\ No newline at end of file
+/usr/lib/rpm/config.guess
\ No newline at end of file
diff --git a/sflphone-common/libs/pjproject/config.sub b/sflphone-common/libs/pjproject/config.sub
index 04fd6e297dd1d34bdeef7379188d6f7f61419426..a7d52c63542a219b06bf61cd18b2c8a28b9d3bf0 120000
--- a/sflphone-common/libs/pjproject/config.sub
+++ b/sflphone-common/libs/pjproject/config.sub
@@ -1 +1 @@
-/usr/share/misc/config.sub
\ No newline at end of file
+/usr/lib/rpm/config.sub
\ No newline at end of file
diff --git a/sflphone-common/libs/pjproject/pjlib/build/os-auto.mak b/sflphone-common/libs/pjproject/pjlib/build/os-auto.mak
index fc6b33eb281a26cda527f76732eccd3b3fceada5..7439bddaecf33cf8d65d1b04477b1aa58e6aa225 100644
--- a/sflphone-common/libs/pjproject/pjlib/build/os-auto.mak
+++ b/sflphone-common/libs/pjproject/pjlib/build/os-auto.mak
@@ -1,7 +1,7 @@
 # pjlib/build/os-auto.mak.  Generated from os-auto.mak.in by configure.
 
 # Determine OS specific files
-AC_OS_OBJS=ioqueue_select.o file_access_unistd.o file_io_ansi.o os_core_unix.o os_error_unix.o os_time_unix.o os_timestamp_posix.o guid_uuid.o
+AC_OS_OBJS=ioqueue_select.o file_access_unistd.o file_io_ansi.o os_core_unix.o os_error_unix.o os_time_unix.o os_timestamp_posix.o guid_simple.o
 
 #
 # PJLIB_OBJS specified here are object files to be included in PJLIB
@@ -23,7 +23,7 @@ export TEST_OBJS +=	main.o
 #
 # Additional LDFLAGS for pjlib-test
 #
-export TEST_LDFLAGS +=  -lm -luuid -lnsl -lrt -lpthread  -lasound -lssl -lcrypto
+export TEST_LDFLAGS +=  -lm -lnsl -lrt -lpthread  -lasound -lssl -lcrypto
 
 #
 # TARGETS are make targets in the Makefile, to be executed for this given