diff --git a/src/Makefile b/src/Makefile
index ebca28d..379e25a 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -8,7 +8,7 @@ CFLAGSF	= -W -Wall
 CFLAGS	= -g
 AR	= ar -rc
 RANLIB	= ranlib
-LD	= ld -shared
+LD	= $(CC) -shared
 BINDIR	= $(PREFIX)/bin
 RM	= rm -f
 MKDIR	= mkdir -p
@@ -25,7 +25,7 @@ libcpp.a: $(libcpp_OBJS)
 	$(RANLIB) libcpp.a
 
 libcpp.so: $(libcpp_OBJS)
-	$(LD) -o libcpp.so $(libcpp_OBJS) -L $(LIBDIR) -rpath $(LIBDIR) -l System
+	$(LD) -o libcpp.so $(libcpp_OBJS) -L $(LIBDIR) -Wl,-rpath $(LIBDIR) -l System
 
 cpp_OBJS = main.o
 cpp_CFLAGS = $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
diff --git a/src/project.conf b/src/project.conf
index 23293a1..e457b05 100644
--- a/src/project.conf
+++ b/src/project.conf
@@ -8,7 +8,7 @@ dist=Makefile
 type=library
 sources=cpp.c,scanner.c
 cflags=-fPIC
-ldflags=-L $(LIBDIR) -rpath $(LIBDIR) -l System
+ldflags=-L $(LIBDIR) -Wl,-rpath $(LIBDIR) -l System
 install=$(LIBDIR)
 
 [cpp.c]