diff --git a/profiles/adelie/1.0/x86/i525/parent b/profiles/adelie/1.0/x86/i525/parent
new file mode 100644
index 0000000000000000000000000000000000000000..71235bc8c4061540ba2ea50ff62d8b964f7cad06
--- /dev/null
+++ b/profiles/adelie/1.0/x86/i525/parent
@@ -0,0 +1,2 @@
+../../../../arch/x86/i525
+..
diff --git a/profiles/arch/x86/i525/make.defaults b/profiles/arch/x86/i525/make.defaults
new file mode 100644
index 0000000000000000000000000000000000000000..a0b5e2df74a8ef567c7b63ad0907aec25237417f
--- /dev/null
+++ b/profiles/arch/x86/i525/make.defaults
@@ -0,0 +1,15 @@
+CHOST="pentium3-foxkit-linux-musl"
+
+# -O2           -> Perform second-level optimisations.
+#                  Not -Os because most/all x86 aren't starved for space.
+# -ggdb         -> Generate GDB debugging information.
+#                  This is used with splitdebug to make -dbg split packages.
+# -march=pen... -> Require a Pentium III or newer.
+# -mtune=pen... -> Tune for Pentium M processors.
+#                  More Pentium M netbooks exist than many realise, and they
+#                  are more likely users of Adélie than Pentium III.  This
+#                  makes code more performant on the larger base of machines.
+# -mfpmath=sse  -> Use SSE for all floating point math.
+#                  Since SSE is always available, this knob ensures that GCC
+#                  will take advantage of it over preferring 387 math.
+CFLAGS="-O2 -ggdb -march=pentium3 -mtune=pentium-m -mfpmath=sse"
diff --git a/profiles/arch/x86/i525/parent b/profiles/arch/x86/i525/parent
new file mode 100644
index 0000000000000000000000000000000000000000..f3229c5b98768fac9af7b7ba56da9c071958d0f3
--- /dev/null
+++ b/profiles/arch/x86/i525/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/arch/x86/make.defaults b/profiles/arch/x86/make.defaults
index 8cc538311d00b29dd26719abb4bfad5eb6c73b22..258cf16e7c9702cb5e77f64a8a362c6530dc88d6 100644
--- a/profiles/arch/x86/make.defaults
+++ b/profiles/arch/x86/make.defaults
@@ -1 +1,10 @@
-ARCH=x86
+# CHOST is defined in each subarch.
+
+# We definitely use 32-bit ABI.
+ABI_X86="32"
+IUSE_IMPLICIT="abi_x86_32"
+
+ARCH="x86"
+ACCEPT_KEYWORDS="x86"
+
+USE="pam threads"
diff --git a/profiles/arch/x86/use.mask b/profiles/arch/x86/use.mask
new file mode 100644
index 0000000000000000000000000000000000000000..db7ada688815b25381f43d1e2341f423301ebfa0
--- /dev/null
+++ b/profiles/arch/x86/use.mask
@@ -0,0 +1 @@
+abi_x86_64
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index c782eb4a164e44daad8bad28cdf71293a9a431cb..29f619fa8dd3dd7845029bbe2545b6888a9acefd 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -8,7 +8,7 @@ USE_EXPAND_IMPLICIT="ARCH ELIBC KERNEL USERLAND"
 # Tier 1 and Tier 2 only, for now.  Consult Platform Group before *ever* changing this.
 TIER1_ARCH="x86 x86_64 ppc ppc64 mips arm"
 TIER2_ARCH="alpha arm64 hppa ia64 sparc sparc64"
-UNFORTUNATE_STUPID_XORG_EBUILD_ARCH="x86-interix ppc-aix x86-winnt s390 sh x64-macos"
+UNFORTUNATE_STUPID_XORG_EBUILD_ARCH="x86-interix ppc-aix x86-winnt s390 sh x64-macos x86-fbsd amd64-fbsd"
 USE_EXPAND_VALUES_ARCH="${TIER1_ARCH} ${TIER2_ARCH} ${UNFORTUNATE_STUPID_XORG_EBUILD_ARCH}"
 
 # We only support these libcs right now.
@@ -55,6 +55,8 @@ FETCHCOMMAND="curl -f -L -o \"\${DISTDIR}\"/\"\${FILE}\" \"\${URI}\""
 # It can't be overriden in the systemd profile!
 INSTALL_MASK="/usr/lib/charset.alias"
 
+PORTAGE_TMPDIR="/usr/src"
+
 INPUT_DEVICES="*"
 VIDEO_CARDS="amdgpu apm ast chips cirrus dummy epson fbdev glint i128 i740 intel mach64 mga neomagic nouveau nv qxl r128 rendition s3 s3virge savage siliconmotion sisusb tdfx tga trident tseng vesa via vmware voodoo"
 
diff --git a/profiles/base/package.accept_keywords b/profiles/base/package.accept_keywords
index a8a5477ba287a24315f00945443c05a8ccbed834..200b4c89b4565dcdd991027bc61432cc29e79b78 100644
--- a/profiles/base/package.accept_keywords
+++ b/profiles/base/package.accept_keywords
@@ -2,6 +2,7 @@
 =app-arch/pax-20160306 **
 =app-crypt/gnupg-2.1.12-r1 **
 =app-eselect/eselect-timezone-0.2 **
+=app-shells/rc-1.7.4 **
 =dev-libs/glib-2.48.1 **
 =dev-libs/libassuan-2.4.2 **
 =dev-libs/libgcrypt-1.7.1 **
@@ -24,6 +25,7 @@
 <www-client/firefox-46.0 **
 =x11-libs/libdrm-2.4.68 **
 =x11-libs/libva-vdpau-driver-0.7.4-r4 **
+=x11-misc/xscreensaver-5.35 **
 
 =dev-lang/python-3.4.3-r7 **
 =app-eselect/eselect-python-20160222 **
diff --git a/profiles/base/package.use b/profiles/base/package.use
index f8c67f385b7055f9e40508d61eca4d08e0e1ccf0..c46cb1c83e1c2f82c26ce0c894dae4e492cb1fde 100644
--- a/profiles/base/package.use
+++ b/profiles/base/package.use
@@ -120,6 +120,7 @@ xfce-base/xfwm4 dri xcomposite
 # User-requested tweaks, recommended flags, and Adélie-specific features.
 app-crypt/gnupg bzip2 -gnutls readline smartcard usb
 app-emulation/wine cups fontconfig jpeg ncurses openal opengl perl pipelight png pulseaudio run-exes s3tc scanner staging truetype udisks vaapi xcomposite xinerama xml
+app-shells/rc readline
 media-gfx/sane-backends usb
 media-gfx/xsane jpeg png tiff
 media-libs/gst-plugins-base X theora