diff --git a/Makefile b/Makefile
index adfe86f..9b6a48b 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@ firecgi.o: $(objects) firebuf/firebuf.o fireusage/fireusage.o
 	gold -z relro -z now -r --output=$@ $+
 
 firecgi.so: $(objects) firebuf/firebuf.o fireusage/fireusage.o
-	$(FIRE_CXX) $(FIRE_CXXFLAGS) $(FIRE_LDFLAGS) -shared -o $@ $+ $(FIRE_LDFLIBS)
+	$(FIRE_CXX) $(FIRE_CXXFLAGS) $(FIRE_LDFLAGS) -shared -o $@ $+ $(FIRE_LDLIBS)
 
 example_simple: example_simple.o firecgi.o
 	$(FIRE_CXX) $(FIRE_CXXFLAGS) $(FIRE_LDFLAGS) -pie -o $@ $+ $(FIRE_LDLIBS)
diff --git a/firebuf b/firebuf
index 858b291..109a9be 160000
--- a/firebuf
+++ b/firebuf
@@ -1 +1 @@
-Subproject commit 858b291f46b438a48d20e0a11c64195d2e3fd305
+Subproject commit 109a9be1935c5a87d0cef8b6a0142281e1469cd1
diff --git a/fireusage b/fireusage
index e03b7da..37be853 160000
--- a/fireusage
+++ b/fireusage
@@ -1 +1 @@
-Subproject commit e03b7da0566e855914d37f6ff4668cab0f7dea3e
+Subproject commit 37be853a8b3671f27164d5656dc9b86ce0c288e0