diff --git a/Makefile b/Makefile
index eef62dd..96c17b8 100644
--- a/Makefile
+++ b/Makefile
@@ -2,18 +2,20 @@ FIRE_CXX ?= clang++
 FIRE_CXXFLAGS ?= -O3 -std=gnu++2a -Wall -Werror
 FIRE_LDLIBS ?= -lgflags -lglog -lpthread
 
-all: firesse.a example_clock
+all: firesse.a firesse.o example_clock
 
-objects = firesse.o stream.o
+objects = server.o stream.o
 
-_firecgi:
+firecgi/firecgi.o:
 	$(MAKE) --directory=firecgi
 
-firesse.a: $(objects) _firecgi
-	ar x firecgi/firecgi.a
-	ar rcs $@ $(objects) $(shell ar t firecgi/firecgi.a)
+firesse.a: $(objects)
+	ar rcs $@ $^
 
-example_clock: example_clock.o firesse.a
+firesse.o: $(objects) firecgi/firecgi.o
+	ld --relocatable --output=$@ $+
+
+example_clock: example_clock.o firesse.o
 	$(FIRE_CXX) $(FIRE_CXXFLAGS) -o $@ $+ $(FIRE_LDLIBS)
 
 %.o: %.cc *.h Makefile
diff --git a/example_clock.cc b/example_clock.cc
index fb63441..bdb480d 100644
--- a/example_clock.cc
+++ b/example_clock.cc
@@ -2,7 +2,7 @@
 #include <glog/logging.h>
 #include <sys/time.h>
 
-#include "firesse.h"
+#include "server.h"
 
 DEFINE_int32(port, 9000, "TCP port to bind");
 
diff --git a/firecgi b/firecgi
index 90ce269..1cba4ac 160000
--- a/firecgi
+++ b/firecgi
@@ -1 +1 @@
-Subproject commit 90ce26986920d0475834354cd351f636042875b7
+Subproject commit 1cba4ac1aef640b454afd18ade4c2f87381cc8ff
diff --git a/firesse.cc b/server.cc
similarity index 97%
rename from firesse.cc
rename to server.cc
index bb76119..de94b55 100644
--- a/firesse.cc
+++ b/server.cc
@@ -1,4 +1,4 @@
-#include "firesse.h"
+#include "server.h"
 
 namespace firesse {
 
diff --git a/firesse.h b/server.h
similarity index 92%
rename from firesse.h
rename to server.h
index 65d8bd2..1cd8046 100644
--- a/firesse.h
+++ b/server.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "firecgi/firecgi.h"
+#include "firecgi/server.h"
 #include "stream.h"
 
 namespace firesse {