diff --git a/Makefile b/Makefile
index 04a5abb..5e330be 100644
--- a/Makefile
+++ b/Makefile
@@ -7,6 +7,8 @@ CFLAGS = $(O) $(CDEFS) -g -Wall -Idynstr/include -MD -MF $(@:.o=.d)
 LIBS = -lcjson -lssl -lm -lcrypto
 LDFLAGS = $(LIBS)
 DEPS = $(OBJECTS:.o=.d)
+DYNSTR = dynstr/libdynstr.a
+DYNSTR_FLAGS = -Ldynstr -ldynstr
 OBJECTS = \
 	auth.o \
 	base64.o \
@@ -18,15 +20,17 @@ OBJECTS = \
 	jwt.o \
 	main.o \
 	page.o \
-	server.o \
-	dynstr/dynstr.o
+	server.o
 
 all: $(PROJECT)
 
 clean:
 	rm -f $(OBJECTS) $(DEPS)
 
-$(PROJECT): $(OBJECTS)
-	$(CC) $(OBJECTS) $(LDFLAGS) -o $@
+$(PROJECT): $(OBJECTS) $(DYNSTR)
+	$(CC) $(OBJECTS) $(LDFLAGS) $(DYNSTR_FLAGS) -o $@
+
+$(DYNSTR):
+	+cd dynstr && $(MAKE)
 
 -include $(DEPS)
diff --git a/dynstr b/dynstr
index 909d716..5c13c9b 160000
--- a/dynstr
+++ b/dynstr
@@ -1 +1 @@
-Subproject commit 909d716a1e6d0c03b61b2a73ad3c2bd20fa55cf2
+Subproject commit 5c13c9b8385cb2742f342d4d2f64d4e2d21108ba