diff --git a/Makefile b/Makefile
index 3f4d49e..6c52fb7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,8 @@
 # Makefile for source rpm: fedora-release
-# $Id: Makefile,v 1.2 2007/10/15 18:44:51 notting Exp $
+# $Id: Makefile,v 1.3 2008/09/10 22:26:31 cscott Exp $
 NAME := fedora-release
 SPECFILE = $(firstword $(wildcard *.spec))
+MOCKCFG = olpc-3-i386
 
 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
diff --git a/fedora-release.spec b/fedora-release.spec
index c467991..c6ae7ae 100644
--- a/fedora-release.spec
+++ b/fedora-release.spec
@@ -4,7 +4,7 @@
 Summary:	Fedora release files
 Name:		fedora-release
 Version:	9
-Release:	3.1
+Release:	5.transition.1
 License:	GPLv2
 Group:		System Environment/Base
 URL:		http://laptop.org
@@ -54,6 +54,14 @@ for arch in i386 x86_64 ppc ppc64
 done
 ln -s RPM-GPG-KEY-fedora-primary RPM-GPG-KEY-fedora
 ln -s RPM-GPG-KEY-fedora-test-primary RPM-GPG-KEY-fedora-test
+# Do the same for newkey
+for arch in i386 x86_64 ppc ppc64
+  do
+  ln -s RPM-GPG-KEY-fedora-8-and-9-primary      RPM-GPG-KEY-fedora-8-and-9-$arch
+  ln -s RPM-GPG-KEY-fedora-test-8-and-9-primary RPM-GPG-KEY-fedora-test-8-and-9-$arch
+done
+ln -s RPM-GPG-KEY-fedora-8-and-9-primary      RPM-GPG-KEY-fedora-8-and-9
+ln -s RPM-GPG-KEY-fedora-test-8-and-9-primary RPM-GPG-KEY-fedora-test-8-and-9
 popd
 
 install -d -m 755 $RPM_BUILD_ROOT/etc/yum.repos.d
@@ -99,6 +107,12 @@ rm -rf $RPM_BUILD_ROOT
 /etc/pki/rpm-gpg/*
 
 %changelog
+* Wed Sep 10 2008 C. Scott Ananian <cscott@laptop.org> - 9-5.transition.1
+- Update OLPC fork to 5.transition.
+
+* Mon Sep 08 2008 Warren Togami <wtogami@redhat.com> - 9-5.transition
+- transition state between old and new key
+
 * Fri Sep 05 2008 C. Scott Ananian <cscott@laptop.org> - 9-3.1
 - OLPC-local changes.
 
diff --git a/sources b/sources
index 76b4301..8d8235f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d3037f3460e9ce7288263cf8f2b90053  fedora-release-9.tar.gz
+06b8fcead95435ca7c8e2c10da0cba7d  fedora-release-9.tar.gz