diff --git a/ruamoko/qwaq/Makefile.am b/ruamoko/qwaq/Makefile.am
index c61fbafb7..3a65cfbbf 100644
--- a/ruamoko/qwaq/Makefile.am
+++ b/ruamoko/qwaq/Makefile.am
@@ -6,7 +6,7 @@ QWAQ_INCS=@QWAQ_INCS@
 
 AM_CPPFLAGS=	-I$(top_srcdir)/include $(QWAQ_INCS) $(PTHREAD_CFLAGS)
 
-noinst_PROGRAMS=@QWAQ_TARGETS@ qwaq-app.dat$(EXEEXT)
+noinst_PROGRAMS=@QWAQ_TARGETS@ qwaq-app.dat$(EXEEXT) gcd.dat$(EXEEXT)
 
 QFCC_DEP=$(top_builddir)/tools/qfcc/source/qfcc$(EXEEXT)
 QFCC=$(top_builddir)/tools/qfcc/source/qfcc
@@ -90,6 +90,14 @@ qwaq-app.dat$(EXEEXT): $(qwaq_app_obj) $(QFCC_DEP)
 include $(qwaq_app_dep) # am--include-marker
 r_depfiles_remade += $(qwaq_app_dep)
 
+gcd_dat_SOURCES=gcd.r
+gcd_obj=$(gcd_dat_SOURCES:.r=.o)
+gcd_dep=$(addprefix ./$(DEPDIR)/,$(gcd_obj:.o=.Qo))
+gcd.dat$(EXEEXT): $(gcd_obj) $(QFCC_DEP)
+	$(QLINK) -o $@ $(gcd_obj) -lcsqc -lr
+include $(gcd_dep) # am--include-marker
+r_depfiles_remade += $(gcd_dep)
+
 $(r_depfiles_remade):
 	@$(MKDIR_P) $(@D)
 	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
diff --git a/tools/qfcc/test/old/gcd.r b/ruamoko/qwaq/gcd.r
similarity index 100%
rename from tools/qfcc/test/old/gcd.r
rename to ruamoko/qwaq/gcd.r