diff --git a/ruamoko/game/Makefile b/ruamoko/game/Makefile
index a33dc5abc..dbffeeaa7 100644
--- a/ruamoko/game/Makefile
+++ b/ruamoko/game/Makefile
@@ -13,7 +13,7 @@ game_dep = $(addprefix .deps/,$(addsuffix .d,$(basename $(game_source))))
 
 %.qfo: %.r
 	@mkdir -p .deps
-	@$(QFCC) -q -M $(QCPPFLAGS) -c $< | sed -e 's/\.r\.o\>/.qfo/' > .deps/`basename $@ .qfo`.d
+	@$(QFCC) -q -M $(QCPPFLAGS) -c $< | sed -e 's/\(\.r\)\?\.o\>/.qfo/' > .deps/`basename $@ .qfo`.d
 	$(QFCC) $(QCFLAGS) $(QCPPFLAGS) -c -o $@ $<
 
 %.qfo: %.qc
diff --git a/ruamoko/include/message.h b/ruamoko/include/message.h
index 927bd650b..370c78bb4 100644
--- a/ruamoko/include/message.h
+++ b/ruamoko/include/message.h
@@ -34,7 +34,7 @@
 #define MULTICAST_PHS_R 4
 #define MULTICAST_PVS_R 5
 
-@extern void (string s) bprint;
+@extern void (...) bprint;
 @extern void (float to, float f) WriteByte;
 @extern void (float to, float f) WriteChar;
 @extern void (float to, float f) WriteShort;
diff --git a/ruamoko/lib/Makefile b/ruamoko/lib/Makefile
index d3c8a91d5..7241d568b 100644
--- a/ruamoko/lib/Makefile
+++ b/ruamoko/lib/Makefile
@@ -24,7 +24,7 @@ libr_dep = $(addprefix .deps/,$(addsuffix .d,$(basename $(libr_source))))
 
 %.qfo: %.r
 	@mkdir -p .deps
-	@$(QFCC) -M -q $(QCPPFLAGS) -c $< | sed -e 's/\.r\.o\>/.qfo/' > .deps/`basename $@ .qfo`.d
+	@$(QFCC) -M -q $(QCPPFLAGS) -c $< | sed -e 's/\(\.r\)\?\.o\>/.qfo/' > .deps/`basename $@ .qfo`.d
 	$(QFCC) $(QCFLAGS) $(QCPPFLAGS) -c -o $@ $<
 
 %.qfo: %.qc
diff --git a/ruamoko/lib/message.r b/ruamoko/lib/message.r
index 6388cebd6..0b0ae4181 100644
--- a/ruamoko/lib/message.r
+++ b/ruamoko/lib/message.r
@@ -1,6 +1,6 @@
 #include "message.h"
 
-void (string s) bprint = #23;
+void (...) bprint = #23;
 void (float to, float f) WriteByte = #52;
 void (float to, float f) WriteChar = #53;
 void (float to, float f) WriteShort = #54;