diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index f9d804a..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-initscripts-8.85.tar.bz2
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..b3089af
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+initscripts-8.86.3.tar.bz2
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 578df4e..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: initscripts
-# $Id$
-NAME := initscripts
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/initscripts.spec b/initscripts.spec
index 260bd8a..dedebd6 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -2,7 +2,7 @@
 
 Summary: The inittab file and the /etc/init.d scripts
 Name: initscripts
-Version: 8.85
+Version: 8.86.3
 # ppp-watch is GPLv2+, everything else is GPLv2
 License: GPLv2 and GPLv2+
 Group: System Environment/Base
@@ -142,7 +142,7 @@ rm -rf $RPM_BUILD_ROOT
 /etc/sysconfig/network-scripts/network-functions
 /etc/sysconfig/network-scripts/network-functions-ipv6
 /etc/sysconfig/network-scripts/init.ipv6-global
-/etc/sysconfig/network-scripts/ifcfg-lo
+%config(noreplace) /etc/sysconfig/network-scripts/ifcfg-lo
 /etc/sysconfig/network-scripts/ifup-ipx
 /etc/sysconfig/network-scripts/ifup-post
 /etc/sysconfig/network-scripts/ifdown-ppp
@@ -250,6 +250,37 @@ rm -rf $RPM_BUILD_ROOT
 /etc/profile.d/debug*
 
 %changelog
+* Tue Apr  7 2009 Bill Nottingham <notting@redhat.com> - 8.86.3-1
+- prefdm: add simple fallbacks, sort rpmdb query for consistency (#494461)
+- backport accidentally missed fix for #480799
+
+* Thu Apr  2 2009 Bill Nottingham <notting@redhat.com> - 8.86.2-1
+- rc.sysinit: add a disk synchronization point with scsi_wait_scan post-udev (#481470)
+- setsysfont: honor LC_CTYPE (#487133, <skasal@redhat.com>)
+- prefdm: do fallbacks based on provides of 'service(graphical-login)' (#485751)
+- rc.sysinit: catch the right error code from checking for passphrases (#483269, <vladis.kletnieks@vt.edu>)
+- prefdm: handle empty /etc/sysconfig/desktop correctly (#480113)
+- ifup-eth: fix dhcpv6 when there is no IPv4 configuration (#486507)
+- bring up ipsec interfaces last (#481733)
+- ifdown-eth: fix bridge + vlan (#481557, <danken@redhat.com>)
+- init.d/halt: determine reboot/halt via existing INIT_HALT environment variable. (#475227)
+- rc.sysinit: fix typo. (#487926)
+- fix switching from targeted to MLS policy (#479054, <dwalsh@redhat.com>)
+- network-functions-ipv6: set MTU correctly for 6to4. (#477976, <ackistler@yahoo.com>)
+- add more entries to rwtab (#476799, <harald@redhat.com>)
+- rc.sysinit: remove /.suspended as well on boot (#270861)
+- add %config back for ifcfg-lo (#472761)
+- remove support for no longer existing 'brctl setgcint' command. (#360471)
+- rcS/rcS-sulogin: don't match commented lines when finding runlevel (#472717)
+- sysconfig.txt: add some docs on BONDING_OPTS
+- lang.sh: ignore return code from consoletype (#471123)
+
+* Tue Nov 11 2008 Bill Nottingham <notting@redhat.com> - 8.86-1
+- stop plymouth before stopping the runlevel (#467207)
+- fix get_config_by_subchannel (#459044, <harald@redhat.com>)
+- use blkid -l to pick a single most appropriate device (#470027)
+- don't mkswap on halt, as it breaks swap-by-label/UUID (#469823)
+
 * Fri Oct 31 2008 Bill Nottingham <notting@redhat.com> - 8.85-1
 - add some error handling/hiding to netfs NM dispatcher script (#469197)
 - halt: fix code that causes a syntax error on multiple sound cards (#469156)
diff --git a/sources b/sources
index 20b8633..15bfcb2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1b7863eca343cc9eb54ef86182b36422  initscripts-8.85.tar.bz2
+da1e426570cbb80c95dfe8ba182137d9  initscripts-8.86.3.tar.bz2