diff --git a/sys/conf/options.powerpc b/sys/conf/options.powerpc
index a6dc6da17136..e89bda91ae40 100644
--- a/sys/conf/options.powerpc
+++ b/sys/conf/options.powerpc
@@ -1,8 +1,7 @@
 # $FreeBSD$
 # Options specific to the powerpc platform kernels
 
-OEA			opt_global.h
-IPKDB
+AIM			opt_global.h
 
 GFB_DEBUG		opt_gfb.h
 GFB_NO_FONT_LOADING	opt_gfb.h
diff --git a/sys/powerpc/conf/GENERIC b/sys/powerpc/conf/GENERIC
index 7f1cc40216c3..2207335982a2 100644
--- a/sys/powerpc/conf/GENERIC
+++ b/sys/powerpc/conf/GENERIC
@@ -18,7 +18,7 @@
 #
 # $FreeBSD$
 
-cpu		OEA
+cpu		AIM
 ident		GENERIC
 
 #To statically compile in device wiring instead of /boot/device.hints
diff --git a/sys/powerpc/conf/NOTES b/sys/powerpc/conf/NOTES
index 176e66134153..e25528ab4224 100644
--- a/sys/powerpc/conf/NOTES
+++ b/sys/powerpc/conf/NOTES
@@ -10,7 +10,7 @@
 
 #
 # You must specify at least one CPU (the one you intend to run on).
-cpu		OEA
+cpu		AIM
 
 options 	POWERMAC		#NewWorld Apple PowerMacs
 options 	PSIM			#GDB PSIM ppc simulator
diff --git a/sys/powerpc/include/fpu.h b/sys/powerpc/include/fpu.h
index d712b9458903..17eec0b48b64 100644
--- a/sys/powerpc/include/fpu.h
+++ b/sys/powerpc/include/fpu.h
@@ -70,13 +70,9 @@
 
 #ifdef _KERNEL
 
-/* List of PowerPC architectures that support FPUs. */
-#if defined(OEA)
-#define PPC_HAVE_FPU
-
 void    enable_fpu(struct thread *);
 void    save_fpu(struct thread *);
-#endif /* PPC_HAVE_FPU */
+
 #endif /* _KERNEL */
 
 #endif	/* _MACHINE_FPU_H_ */