diff --git a/bootscripts/Makefile b/bootscripts/Makefile
index c789a7225..85bd722f5 100644
--- a/bootscripts/Makefile
+++ b/bootscripts/Makefile
@@ -72,7 +72,6 @@ install: create-dirs create-service-dir
 	ln -sf ../init.d/modules     ${EXTDIR}/rc.d/rcsysinit.d/S05modules
 	ln -sf ../init.d/udev        ${EXTDIR}/rc.d/rcsysinit.d/S10udev
 	ln -sf ../init.d/swap        ${EXTDIR}/rc.d/rcsysinit.d/S20swap
-	ln -sf ../init.d/setclock    ${EXTDIR}/rc.d/rcsysinit.d/S25setclock
 	ln -sf ../init.d/checkfs     ${EXTDIR}/rc.d/rcsysinit.d/S30checkfs
 	ln -sf ../init.d/mountfs     ${EXTDIR}/rc.d/rcsysinit.d/S40mountfs
 	ln -sf ../init.d/cleanfs     ${EXTDIR}/rc.d/rcsysinit.d/S45cleanfs
@@ -123,7 +122,6 @@ minimal: create-dirs create-service-dir
 	ln -sf ../init.d/mountkernfs ${EXTDIR}/rc.d/rcsysinit.d/S00mountkernfs
 	ln -sf ../init.d/udev        ${EXTDIR}/rc.d/rcsysinit.d/S10udev
 	ln -sf ../init.d/swap        ${EXTDIR}/rc.d/rcsysinit.d/S20swap
-	ln -sf ../init.d/setclock    ${EXTDIR}/rc.d/rcsysinit.d/S25setclock
 	ln -sf ../init.d/checkfs     ${EXTDIR}/rc.d/rcsysinit.d/S30checkfs
 	ln -sf ../init.d/mountfs     ${EXTDIR}/rc.d/rcsysinit.d/S40mountfs
 	ln -sf ../init.d/cleanfs     ${EXTDIR}/rc.d/rcsysinit.d/S45cleanfs
diff --git a/bootscripts/lfs/init.d/setclock b/bootscripts/lfs/init.d/setclock
index a87fb2d23..c786acec5 100644
--- a/bootscripts/lfs/init.d/setclock
+++ b/bootscripts/lfs/init.d/setclock
@@ -16,8 +16,6 @@
 . ${rc_functions}
 . /etc/sysconfig/clock
 
-CLOCKPARAMS=
-
 case "${UTC}" in
 	yes|true|1)
 		CLOCKPARAMS="${CLOCKPARAMS} --utc"
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index c37bfc57a..34d82eb82 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,6 +40,13 @@
     <listitem>
       <para>2009-05-23</para>
       <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Change the bootsripts and udev configuration
+          so the rtc is set by udev upon boot. Removed aio device
+          from udev configuration.  Fixes
+          <ulink url="&lfs-ticket-root;2266">#2266</ulink> and
+          <ulink url="&lfs-ticket-root;2297">#2297</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[bdubbs] - Expand package management discussion and
           add a section on deploying an LFS system to another host. Fixes
diff --git a/chapter07/setclock.xml b/chapter07/setclock.xml
index 3166c8392..854b889c6 100644
--- a/chapter07/setclock.xml
+++ b/chapter07/setclock.xml
@@ -23,6 +23,11 @@
   way to detect whether or not the hardware clock is set to UTC, so this
   needs to be configured manually.</para>
 
+  <para>The <command>setclock</command> is run via
+  <application>udev</application> when the kernel detects the hardware
+  capability upon boot.  It can also be run manually with the stop parameter to
+  store the system time to the CMOS clock.</para>
+
   <para>If you cannot remember whether or not the hardware clock is set to UTC,
   find out by running the <userinput>hwclock --localtime --show</userinput>
   command. This will display what the current time is according to the hardware
@@ -46,6 +51,10 @@
 
 UTC=1
 
+# Set this to any options you might need to give to hwclock, 
+# such as machine hardware clock type for Alphas.
+CLOCKPARAMS=
+
 # End /etc/sysconfig/clock</literal>
 EOF</userinput></screen>
 
diff --git a/packages.ent b/packages.ent
index a60ed2e70..5919bee60 100644
--- a/packages.ent
+++ b/packages.ent
@@ -298,7 +298,7 @@
 <!ENTITY less-ch6-du "2.8 MB">
 <!ENTITY less-ch6-sbu "0.1 SBU">
 
-<!ENTITY lfs-bootscripts-version "20090517">                 <!-- Scripts depend on this format -->
+<!ENTITY lfs-bootscripts-version "20090523">                 <!-- Scripts depend on this format -->
 <!ENTITY lfs-bootscripts-size "BOOTSCRIPTS-SIZE KB">         <!-- Updated in Makefile -->
 <!ENTITY lfs-bootscripts-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.bz2">
 <!ENTITY lfs-bootscripts-md5 "BOOTSCRIPTS-MD5SUM">           <!-- Updated in Makefile -->
@@ -511,7 +511,7 @@
 <!ENTITY udev-ch6-du "10.7 MB">
 <!ENTITY udev-ch6-sbu "0.2 SBU">
 
-<!ENTITY udev-config "udev-config-20081229"> <!-- Scripts depend on this format -->
+<!ENTITY udev-config "udev-config-20090523"> <!-- Scripts depend on this format -->
 <!ENTITY udev-config-size "UDEV-SIZE KB">    <!-- Updated in Makefile -->
 <!ENTITY udev-config-url "&downloads-root;&udev-config;.tar.bz2">
 <!ENTITY udev-config-md5 "UDEV-MD5SUM">      <!-- Updated in Makefile -->
diff --git a/udev-config/55-lfs.rules b/udev-config/55-lfs.rules
index 732fcde88..2959a2a13 100644
--- a/udev-config/55-lfs.rules
+++ b/udev-config/55-lfs.rules
@@ -2,8 +2,8 @@
 
 # Core kernel devices
 
-KERNEL=="aio",      MODE="0444"
-KERNEL=="rtc",      MODE="0666"
+# This causes the system clock to be set as soon as /dev/rtc becomes available.
+SUBSYSTEM=="rtc", MODE="0644", ACTION=="add", RUN+="/etc/rc.d/init.d/setclock start"
 
 # Comms devices