diff --git a/config/Makefile.gnu b/config/Makefile.gnu
index 496e6c7..69846ab 100644
--- a/config/Makefile.gnu
+++ b/config/Makefile.gnu
@@ -1,6 +1,6 @@
 NAME = $(GLEW_NAME)
 CC = cc
-LD = ld
+LD = cc
 ifneq (undefined, $(origin GLEW_MX))
 CFLAGS.EXTRA = -DGLEW_MX
 endif
diff --git a/config/Makefile.kfreebsd b/config/Makefile.kfreebsd
index ff82be3..ace80ff 100644
--- a/config/Makefile.kfreebsd
+++ b/config/Makefile.kfreebsd
@@ -1,11 +1,11 @@
 NAME = $(GLEW_NAME)
 CC = cc
-LD = ld
+LD = cc
 ifneq (undefined, $(origin GLEW_MX))
 CFLAGS.EXTRA = -DGLEW_MX
 endif
 PICFLAG = -fPIC
-LDFLAGS.SO = -shared -soname $(LIB.SONAME)
+LDFLAGS.SO = -shared -Wl,-soname $(LIB.SONAME)
 LDFLAGS.EXTRA = -L/usr/X11R6/lib
 LDFLAGS.GL = -lXmu -lXi -lGLU -lGL -lXext -lX11
 LDFLAGS.STATIC = -Wl,-Bstatic