diff --git a/Source/Makefile.in b/Source/Makefile.in
index e3a7246c1..33eb06b8e 100644
--- a/Source/Makefile.in
+++ b/Source/Makefile.in
@@ -320,16 +320,14 @@ NSTimeZone.m \
 NSUnarchiver.m \
 NSValue.m
 
-NSVALUE_CLUSTER = 0 1 2 3 4
-NSVALUE_OFILES  = \
-	NSValue0.o NSValue1.o NSValue2.o NSValue3.o \
-	NSValue4.o
-NSNUMBER_CLUSTER = 0 1 2 3 4 5 6 7 8 9 10 11 12
-NSNUMBER_OFILES  = \
-	NSNumber0.o NSNumber1.o NSNumber2.o NSNumber3.o \
-	NSNumber4.o NSNumber5.o NSNumber6.o NSNumber7.o \
-	NSNumber8.o NSNumber9.o NSNumber10.o NSNumber11.o \
-	NSNumber12.o
+NSVALUE_MFILES = \
+	NSValue0.m NSValue1.m NSValue2.m NSValue3.m \
+	NSValue4.m
+NSNUMBER_MFILES = \
+	NSNumber0.m NSNumber1.m NSNumber2.m NSNumber3.m \
+	NSNumber4.m NSNumber5.m NSNumber6.m NSNumber7.m \
+	NSNumber8.m NSNumber9.m NSNumber10.m NSNumber11.m \
+	NSNumber12.m
 
 GNUSTEP_CFILES = \
 NSZone.c \
@@ -347,7 +345,8 @@ simple-load.h
 GNUSTEP_OBJS = \
 	$(GNUSTEP_MFILES:.m=.o) \
 	$(GNUSTEP_CFILES:.c=.o) \
-	$(NSVALUE_OFILES) $(NSNUMBER_OFILES)
+	$(NSVALUE_MFILES:.m=.o) \
+	$(NSNUMBER_MFILES:.m=.o)
 
 GNUSTEP_HEADERS = \
 Foundation/NSArchiver.h \
@@ -468,24 +467,15 @@ uninstall:
 		$(includedir)/objc \
 		$(includedir)/Foundation 
 
-# Compilation of class clusters
-$(NSVALUE_OFILES) : NSCTemplateValue.m
-	for i in ${NSVALUE_CLUSTER}; do \
-	    cp $(srcdir)/NSCTemplateValue.m NSCTemplateValue$$i.m; \
-	    $(CC) -c $(ALL_CPPFLAGS) $(DEFS) $(ALL_OBJCFLAGS) \
-		-DTYPE_ORDER=$$i NSCTemplateValue$$i.m \
-		-o NSValue$$i.o; \
-	    rm -f NSCTemplateValue$$i.m; \
-	done
-
-$(NSNUMBER_OFILES) : NSConcreteNumber.m
-	for i in ${NSNUMBER_CLUSTER}; do \
-	    cp $(srcdir)/NSConcreteNumber.m NSConcreteNumber$$i.m; \
-	    $(CC) -c $(ALL_CPPFLAGS) $(DEFS) $(ALL_OBJCFLAGS) \
-		-DTYPE_ORDER=$$i -c NSConcreteNumber$$i.m \
-		-o NSNumber$$i.o; \
-	    rm -f NSConcreteNumber$$i.m; \
-	done
+# Creation of NSValue and NSNumber concrete classes from templates
+$(NSVALUE_MFILES) : NSCTemplateValue.m
+	rm -f $@
+	echo '#define TYPE_ORDER' `expr $* : 'NSValue\([0-9]*\)'` > $@
+	cat $(srcdir)/NSCTemplateValue.m >> $@
+$(NSNUMBER_MFILES) : NSConcreteNumber.m
+	rm -f $@
+	echo '#define TYPE_ORDER' `expr $* : 'NSNumber\([0-9]*\)'` > $@
+	cat $(srcdir)/NSConcreteNumber.m >> $@
 
 NXStringTable_scan.c: NXStringTable_scan.l
 	$(LEX) $(LEXFLAGS) -t $(srcdir)/NXStringTable_scan.l \