diff --git a/Makefile b/Makefile
index 3ef5804f..b3ec35cd 100644
--- a/Makefile
+++ b/Makefile
@@ -94,10 +94,10 @@ SEXP_ULIMIT_OBJS = gc-ulimit.o sexp-ulimit.o bignum.o
 EVAL_OBJS = opcodes.o vm.o eval.o simplify.o
 
 libchibi-sexp$(SO): $(SEXP_OBJS)
-	$(CC) $(CLIBFLAGS) -o $@ $^ $(XLDFLAGS)
+	$(CC) $(CLIBFLAGS) $(CLINKFLAGS) -o $@ $^ $(XLDFLAGS)
 
 libchibi-scheme$(SO): $(SEXP_OBJS) $(EVAL_OBJS)
-	$(CC) $(CLIBFLAGS) -o $@ $^ $(XLDFLAGS)
+	$(CC) $(CLIBFLAGS) $(CLINKFLAGS) -o $@ $^ $(XLDFLAGS)
 
 chibi-scheme$(EXE): main.o libchibi-scheme$(SO)
 	$(CC) $(XCPPFLAGS) $(XCFLAGS) -o $@ $< -L. -lchibi-scheme
@@ -114,7 +114,7 @@ clibs.c: $(GENSTATIC) chibi-scheme$(EXE)
 # A special case, this needs to be linked with the LDFLAGS in case
 # we're using Boehm.
 lib/chibi/ast$(SO): lib/chibi/ast.c $(INCLUDES)
-	-$(CC) $(CLIBFLAGS) $(XCPPFLAGS) $(XCFLAGS) -o $@ $< $(GCLDFLAGS) -L. -lchibi-scheme
+	-$(CC) $(CLIBFLAGS) $(CLINKFLAGS) $(XCPPFLAGS) $(XCFLAGS) -o $@ $< $(GCLDFLAGS) -L. -lchibi-scheme
 
 doc/lib/chibi/%.html: lib/chibi/%.sld $(CHIBI_DOC_DEPENDENCIES)
 	$(CHIBI_DOC) --html chibi.$* > $@
diff --git a/Makefile.detect b/Makefile.detect
index 8fe57bc5..7357130a 100644
--- a/Makefile.detect
+++ b/Makefile.detect
@@ -50,20 +50,23 @@ LIBDL = -ldl
 ifeq ($(PLATFORM),macosx)
 SO  = .dylib
 EXE =
-CLIBFLAGS = -dynamiclib
+CLIBFLAGS =
+CLINKFLAGS = -dynamiclib
 STATICFLAGS = -static-libgcc -DSEXP_USE_DL=0
 else
 ifeq ($(PLATFORM),bsd)
 SO  = .so
 EXE =
-CLIBFLAGS = -fPIC -shared
+CLIBFLAGS = -fPIC
+CLINKFLAGS = -shared
 LIBDL = 
 else
 ifeq ($(PLATFORM),mingw)
 SO  = .dll
 EXE = .exe
 CC = gcc
-CLIBFLAGS = -shared
+CLIBFLAGS =
+CLINKFLAGS = -shared
 CPPFLAGS += -DSEXP_USE_STRING_STREAMS=0 -DBUILDING_DLL
 LDFLAGS += -Wl,--out-implib,libchibi-scheme$(SO).a
 STATICFLAGS = -DSEXP_USE_DL=0
@@ -73,13 +76,15 @@ ifeq ($(PLATFORM),cygwin)
 SO  = .dll
 EXE = .exe
 CC = gcc
-CLIBFLAGS = -shared
+CLIBFLAGS =
+CLINKFLAGS = -shared
 CPPFLAGS += -DSEXP_USE_STRING_STREAMS=0
 LDFLAGS += -Wl,--out-implib,libchibi-scheme$(SO).a
 else
 SO  = .so
 EXE =
-CLIBFLAGS = -fPIC -shared
+CLIBFLAGS = -fPIC
+CLINKFLAGS = -shared
 STATICFLAGS = -static -DSEXP_USE_DL=0
 ifeq ($(PLATFORM),BSD)
 LIBDL=
diff --git a/Makefile.libs b/Makefile.libs
index dcbeb00b..9605380f 100644
--- a/Makefile.libs
+++ b/Makefile.libs
@@ -46,7 +46,7 @@ lib/%.c: lib/%.stub $(CHIBI_FFI_DEPENDENCIES)
 	$(CHIBI_FFI) $<
 
 lib/%$(SO): lib/%.c $(INCLUDES)
-	$(CC) $(CLIBFLAGS) $(XCPPFLAGS) $(XCFLAGS) -o $@ $< -L. $(XLIBS) -lchibi-scheme
+	$(CC) $(CLIBFLAGS) $(CLINKFLAGS) $(XCPPFLAGS) $(XCFLAGS) -o $@ $< -L. $(XLIBS) -lchibi-scheme
 
 doc-libs: $(HTML_LIBS)