diff --git a/library/GNUmakefile.68k b/library/GNUmakefile.68k
index 5c95f04..9920c67 100644
--- a/library/GNUmakefile.68k
+++ b/library/GNUmakefile.68k
@@ -1,5 +1,5 @@
 #
-# $Id: GNUmakefile.68k,v 1.45 2005-03-19 11:06:56 obarthel Exp $
+# $Id: GNUmakefile.68k,v 1.46 2005-03-20 17:14:58 obarthel Exp $
 #
 # :ts=8
 #
@@ -302,6 +302,7 @@ C_LIB = \
 	stdlib_labs.o \
 	stdlib_ldiv.o \
 	stdlib_machine_test.o \
+	stdlib_main.o \
 	stdlib_malloc.o \
 	stdlib_math.o \
 	stdlib_mkdtemp.o \
@@ -544,7 +545,6 @@ MATH_LIB = \
 
 MATH_LIB_881 = \
 	m881.lib_rev.o \
-	stdlib_machine_test.o \
 	$(MATH_LIB)
 
 MATH_LIB_IEEE = \
@@ -759,7 +759,7 @@ endif
 
 ##############################################################################
 
-STARTUPS := nrcrt0.o nbcrt0.o nr32crt0.o nb32crt0.o ncrt0.o mainnb.o mainb.o mainb32.o
+STARTUPS := nrcrt0.o nbcrt0.o nr32crt0.o nb32crt0.o ncrt0.o
 
 ##############################################################################
 
@@ -769,9 +769,6 @@ all: \
 	lib/ncrt0.o \
 	lib/n32bcrt0.o \
 	lib/n32rcrt0.o \
-	lib/mainnb.o \
-	lib/mainb.o \
-	lib/mainb32.o \
 	lib/libm020/libm.a \
 	lib/libm.a \
 	lib/libb/libm.a \
@@ -881,15 +878,6 @@ lib/n32bcrt0.o : lib nb32crt0.o
 lib/n32rcrt0.o : lib nr32crt0.o
 	@$(COPY) nr32crt0.o lib
 
-lib/mainnb.o : lib mainnb.o
-	@$(COPY) mainnb.o lib
-
-lib/mainb.o : lib mainb.o
-	@$(COPY) mainb.o lib
-
-lib/mainb32.o : lib mainb32.o
-	@$(COPY) mainb32.o lib
-
 ##############################################################################
 
 $(LIBAMIGA_OBJS)/amiga_hookentry.o : amiga_hookentry.c
@@ -949,18 +937,22 @@ else
 LOCAL_CODE_FLAGS := $(CODE_FLAGS)
 endif
 
+$(LIBM881_OBJS)/math_init_exit.o : math_init_exit.c
+	@echo "Compiling $< [$(TYPE):m881]"
+	@$(CC) -o $(LIBM881_OBJS)/math_init_exit.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(LOCAL_CODE_FLAGS) -DM68881_FLOATING_POINT_SUPPORT $(INCLUDES) $<
+
 $(LIBC_OBJS)/stdlib_machine_test.o : stdlib_machine_test.c
 	@echo "Compiling $< [$(TYPE):c]"
 	@$(CC) -o $(LIBC_OBJS)/stdlib_machine_test.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(LOCAL_CODE_FLAGS) $(INCLUDES) $<
 
-$(LIBM881_OBJS)/stdlib_machine_test.o : stdlib_machine_test.c
-	@echo "Compiling $< [$(TYPE):c]"
-	@$(CC) -o $(LIBM881_OBJS)/stdlib_machine_test.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(LOCAL_CODE_FLAGS) $(INCLUDES) -DM68881_FLOATING_POINT_SUPPORT $<
-
 $(LIBC_OBJS)/stdlib_showerror.o : stdlib_showerror.c
 	@echo "Compiling $< [$(TYPE):c]"
 	@$(CC) -o $(LIBC_OBJS)/stdlib_showerror.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(LOCAL_CODE_FLAGS) $(INCLUDES) $<
 
+$(LIBC_OBJS)/stdlib_main.o : stdlib_main.c
+	@echo "Compiling $< [$(TYPE):c]"
+	@$(CC) -o $(LIBC_OBJS)/stdlib_main.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(LOCAL_CODE_FLAGS) $(INCLUDES) stdlib_main.c
+
 ##############################################################################
 
 $(LIBC_OBJS)/stdlib_alloca_debug.o : stdlib_alloca.c
@@ -1109,18 +1101,6 @@ ncrt0.o : ncrt0.S
 	@echo "Assembling $< [large_data]"
 	@$(CC) -traditional -o $@ -c ncrt0.S
 
-mainb32.o : stdlib_main.c
-	@echo "Compiling $< [small_data32]"
-	@$(CC) -o mainb32.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(INCLUDES) -fbaserel32 -DSMALL_DATA32 -m68020-60 -DM68020 stdlib_main.c
-
-mainb.o : stdlib_main.c
-	@echo "Compiling $< [small_data]"
-	@$(CC) -o mainb.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(INCLUDES) -fbaserel -DSMALL_DATA -m68000 stdlib_main.c
-
-mainnb.o : stdlib_main.c
-	@echo "Compiling $< [large_data]"
-	@$(CC) -o mainnb.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(INCLUDES) -m68000 stdlib_main.c
-
 ##############################################################################
 
 CONSTRUCTOR_FILES = \
diff --git a/library/GNUmakefile.os4 b/library/GNUmakefile.os4
index 3a7e071..ea5fa9f 100644
--- a/library/GNUmakefile.os4
+++ b/library/GNUmakefile.os4
@@ -1,5 +1,5 @@
 #
-# $Id: GNUmakefile.os4,v 1.46 2005-03-20 11:18:06 obarthel Exp $
+# $Id: GNUmakefile.os4,v 1.47 2005-03-20 17:14:58 obarthel Exp $
 #
 # :ts=8
 #
@@ -301,6 +301,7 @@ C_LIB = \
 	stdlib_labs.o \
 	stdlib_ldiv.o \
 	stdlib_machine_test.o \
+	stdlib_main.o \
 	stdlib_malloc.o \
 	stdlib_math.o \
 	stdlib_mkdtemp.o \
@@ -546,7 +547,6 @@ MATH_LIB = \
 	stdio_vsnprintf.o \
 	stdio_vsprintf.o \
 	stdlib_atof.o \
-	stdlib_machine_test.o \
 	stdlib_strtod.o \
 	time_difftime.o
 
diff --git a/library/changes b/library/changes
index 64f9466..c8e91a1 100644
--- a/library/changes
+++ b/library/changes
@@ -118,6 +118,13 @@
   it *again*. Which probably means that the 68k library will
   need further changes...
 
+- Moved stdlib_main.o into the regular lib.c, at least for
+  the 68k build. The PowerPC build may follow later, provided
+  I manage to get the specs file fixed.
+
+- Moved the check for the presence of an FPU into the
+  math_init.c code.
+
 
 c.lib 1.189 (5.3.2005)
 
diff --git a/library/math_init_exit.c b/library/math_init_exit.c
index b1c1206..ba46a4a 100644
--- a/library/math_init_exit.c
+++ b/library/math_init_exit.c
@@ -1,5 +1,5 @@
 /*
- * $Id: math_init_exit.c,v 1.14 2005-03-18 12:38:22 obarthel Exp $
+ * $Id: math_init_exit.c,v 1.15 2005-03-20 17:14:58 obarthel Exp $
  *
  * :ts=4
  *
@@ -118,6 +118,17 @@ MATH_CONSTRUCTOR(math_init)
 
 	ENTER();
 
+	#if defined(M68881_FLOATING_POINT_SUPPORT)
+	{
+		if(FLAG_IS_CLEAR(((struct ExecBase *)SysBase)->AttnFlags,AFF_68881))
+		{
+			__show_error("This program requires a floating point processor.");
+
+			goto out;
+		}
+	}
+	#endif /* M68881_FLOATING_POINT_SUPPORT */
+
 	#if defined(IEEE_FLOATING_POINT_SUPPORT)
 	{
 		char * failed_library = NULL;
diff --git a/library/stdlib_machine_test.c b/library/stdlib_machine_test.c
index 73e5e01..3f6f19b 100644
--- a/library/stdlib_machine_test.c
+++ b/library/stdlib_machine_test.c
@@ -1,5 +1,5 @@
 /*
- * $Id: stdlib_machine_test.c,v 1.5 2005-03-18 12:38:24 obarthel Exp $
+ * $Id: stdlib_machine_test.c,v 1.6 2005-03-20 17:14:58 obarthel Exp $
  *
  * :ts=4
  *
@@ -59,17 +59,6 @@ __machine_test(void)
 	}
 	#endif /* M68020 */
 
-	#if defined(M68881_FLOATING_POINT_SUPPORT)
-	{
-		if(FLAG_IS_CLEAR(((struct ExecBase *)SysBase)->AttnFlags,AFF_68881))
-		{
-			__show_error("This program requires a floating point processor.");
-
-			goto out;
-		}
-	}
-	#endif /* M68881_FLOATING_POINT_SUPPORT */
-
 	result = OK;
 
  out: