diff --git a/Makefile.in b/Makefile.in
index 34b7fe4..71d93a1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -29,6 +29,8 @@ endif
 .PHONY: all
 all: $(PROGRAMS) $(TESTLIBS)
 
+include contrib/Makefile
+
 SOURCE=\
 	base/output_file_requirements.cc \
 	base/application.cc \
@@ -140,10 +142,8 @@ CXX:=@CXX@
 STRIP:=@STRIP@
 OBJECTS:=$(subst .cc,.o,$(SOURCE))
 
-# FIXME EMITTERS += $(PLUGIN_LIBS) doesn't work, probably because it's empty at
-# the time of use?
 ifeq ("@STATIC@", "yes")
-EMITTERS += contrib/*.a
+EMITTERS += $(PLUGIN_LIBS)
 endif
 
 TOP_DIR:=@top_srcdir@
@@ -327,8 +327,6 @@ endif
 
 .PHONY: install
 
-include contrib/Makefile
-
 ifeq ("@TESTING@", "yes")
 include unit-tests/Makefile