diff --git a/Makefile.rules b/Makefile.rules
index 517b8a4389..7f785a2025 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -263,8 +263,8 @@ endif # end of HPCGAP specific code
 ########################################################################
 
 # OBJS shall contain the names of all object files that constitute GAP.
-# So turn all src/*.c and gen/*.c file names in SOURCES into obj/*.lo
-OBJS = $(patsubst gen/%.c,obj/%.lo,$(patsubst src/%.c,obj/%.lo,$(SOURCES)))
+# So turn all FOO/*.c file names in SOURCES into obj/FOO/*.lo
+OBJS = $(patsubst %.c,obj/%.lo,$(SOURCES))
 
 # ensure config.h is built before the compilers gets invoked
 $(OBJS): gen/config.h
@@ -344,16 +344,7 @@ DEPFLAGS = -MQ "$@" -MMD -MP -MF $(DEPFILE)
 COMPILE=$(LIBTOOL) --mode=compile $(CC)
 
 # Build rule for C source files
-# Disabled for HPC-GAP, to ensure we always use the output of ward
-# and not the original source files
-ifeq ($(HPCGAP),no)
-obj/%.lo: src/%.c cnf/GAP-CFLAGS cnf/GAP-CPPFLAGS libtool
-	@$(MKDIR_P) $(@D)/$(DEPDIRNAME)
-	$(QUIET_CC)$(COMPILE) $(DEPFLAGS) $(GAP_CFLAGS) $(GAP_CPPFLAGS) -c $< -o $@
-endif
-
-# Build rule for generated C source files
-obj/%.lo: gen/%.c cnf/GAP-CFLAGS cnf/GAP-CPPFLAGS libtool
+obj/%.lo: %.c cnf/GAP-CFLAGS cnf/GAP-CPPFLAGS libtool
 	@$(MKDIR_P) $(@D)/$(DEPDIRNAME)
 	$(QUIET_CC)$(COMPILE) $(DEPFLAGS) $(GAP_CFLAGS) $(GAP_CPPFLAGS) -c $< -o $@
 
diff --git a/cnf/gac.in b/cnf/gac.in
index f9eae7f69b..0508e107c1 100644
--- a/cnf/gac.in
+++ b/cnf/gac.in
@@ -408,7 +408,7 @@ if [ $comp_howfar = "link" ]; then
         if [ "X${output}" = "X" ]; then output="gacout"; fi
 
         for object in $GAP_OBJS;  do
-            if [ ${object} != "obj/compstat.lo" ]; then
+            if [ ${object} != "obj/src/compstat.lo" ]; then
                 objects="${abs_top_builddir}/${object} ${objects}"
             fi
         done