diff --git a/.cvsignore b/.cvsignore
index 194032f..916d1f5 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1 @@
 memtest86+-2.11.tar.gz
-temp.tar.gz
diff --git a/memtest-setup b/memtest-setup
new file mode 100755
index 0000000..be50310
--- /dev/null
+++ b/memtest-setup
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+# package name
+PNAME="memtest86+"
+
+# executable
+ENAME="elf-memtest86+"
+
+if [ -d /sys/firmware/efi ]; then
+    echo "memtest86+ does not support EFI platforms."
+    exit 254
+fi
+
+MTVERSION=`rpm -q --qf '%{version}' $PNAME`
+MTPATH="/boot/$ENAME-$MTVERSION"
+
+MENT=`cat /boot/grub/grub.conf | grep "$ENAME-$MTVERSION"` &> /dev/null
+if [ "$MENT" != "" ]; then
+    echo "$MTPATH is already configured.  Exiting..."
+    exit 0
+fi
+
+if [ ! -f $MTPATH ]; then
+    echo "ERROR: $MTPATH does not exist."
+    exit 255
+fi
+
+/sbin/new-memtest-pkg --install $MTVERSION --banner="Memtest86+"
+RETVAL="$?"
+
+if [ "$RETVAL" != "0" ]; then
+    echo "ERROR: grubby failed to configure your bootloader for $MTPATH."
+    exit $RETVAL
+else
+    sed -i -e"s,kernel /$ENAME,kernel --type=netbsd /$ENAME," /boot/grub/grub.conf
+    sed -i -e"s,/$ENAME-$MTVERSION.*,/$ENAME-$MTVERSION," /boot/grub/grub.conf
+fi
+
+echo "Setup complete."
diff --git a/memtest86+-2.11.tar.gz b/memtest86+-2.11.tar.gz
new file mode 100644
index 0000000..621b15f
Binary files /dev/null and b/memtest86+-2.11.tar.gz differ
diff --git a/memtest86+.spec b/memtest86+.spec
index 397f388..8f649b4 100644
--- a/memtest86+.spec
+++ b/memtest86+.spec
@@ -7,12 +7,13 @@
 
 Name:     memtest86+
 Version:  2.11
-Release:  7%{?dist}
+Release:  8%{?dist}
 License:  GPLv2
 Summary:  Stand-alone memory tester for x86 and x86-64 computers
 Group:    System Environment/Base
 Source0:  http://www.memtest.org/download/%{version}/%{name}-%{version}.tar.gz
-Source1:  temp.tar.gz
+Source1:  memtest-setup
+Source2:  new-memtest-pkg
 URL:      http://www.memtest.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # require glibc-devel.i386 via this file:
@@ -37,7 +38,7 @@ The script '%{_sbindir}/memtest-setup' can be run (as root)
 to add the %{name} entry to your GRUB boot menu.
 
 %prep
-%setup -q -a 1
+%setup -q 
 sed -i -e's,0x10000,0x100000,' memtest.lds
 
 %build
@@ -53,20 +54,20 @@ mkdir -p %{buildroot}/sbin
 mkdir -p %{buildroot}%{_sbindir}
 
 # the ELF (memtest) version.
-install -m644 memtest %{buildroot}/boot/%{name}-elf-%{version}
+install -m644 memtest %{buildroot}/boot/elf-%{name}-%{version}
 
 # the floppy (memtest.bin) version.
 install -m644 memtest.bin %{buildroot}/boot/%{name}-%{version}
 
-install -m755 temp/new-memtest-pkg %{buildroot}/sbin/new-memtest-pkg
-install -m755 temp/memtest-setup %{buildroot}%{_sbindir}/memtest-setup
+install -m755 %{SOURCE2} %{buildroot}/sbin/new-memtest-pkg
+install -m755 %{SOURCE1} %{buildroot}%{_sbindir}/memtest-setup
 sed -i 's/\r//' $RPM_BUILD_DIR/%{name}-%{version}/README
 
 %if %{with update_grub}
 %post -p /usr/sbin/memtest-setup
 
 %preun
-sed -i -e's,kernel --type=netbsd /%{name}-elf-%{version},kernel /%{name}-elf-%{version},' /boot/grub/grub.conf
+sed -i -e's,kernel --type=netbsd /elf-%{name}-%{version},kernel /elf-%{name}-%{version},' /boot/grub/grub.conf
 /sbin/new-memtest-pkg --remove %{version}
 %endif
 
@@ -77,12 +78,16 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc README
 /boot/%{name}-%{version}
-/boot/%{name}-elf-%{version}
+/boot/elf-%{name}-%{version}
 /sbin/new-memtest-pkg
 %{_sbindir}/memtest-setup
 
 
 %changelog
+* Fri Apr 24 2009 Warren Togami <wtogami@redhat.com> - 2.11-8
+- Bug #494157 rename elf binary so it doesn't accidentally copy the elf binary
+  during livecd-creator
+- Put scripts into CVS
 
 * Sun Apr 05 2009 Paulo Roma <roma@lcg.ufrj.br> - 2.11-7
 - adapted the spec file for building the elf and 
diff --git a/new-memtest-pkg b/new-memtest-pkg
new file mode 100755
index 0000000..28779cc
--- /dev/null
+++ b/new-memtest-pkg
@@ -0,0 +1,339 @@
+#!/bin/bash
+#
+# Invoked upon installation or removal of a kernel package, the following
+# tasks are/can be done here:
+# creation/removal of initrd
+# run of depmod/removal of depmod generated files
+# addition/removal of kernel images from grub/lilo configuration (via grubby)
+#
+# Copyright (C) 2002, 2003 Red Hat, Inc.
+# 
+
+PATH=/sbin:/bin:$PATH
+
+lilo=/sbin/lilo
+
+# some defaults that are sane for most arches
+kernelName=elf-memtest86+
+
+if [ -x ./grubby ]; then
+    grubby=./grubby
+else
+    grubby=/sbin/grubby
+fi
+
+cfgGrub=""
+cfgLilo=""
+runLilo=""
+grubConfig=""
+
+ARCH=$(uname -m)
+
+if [ $ARCH = 'ia64' ]; then
+    liloConfig=/boot/efi/EFI/redhat/elilo.conf
+    bootPrefix=/boot/efi/EFI/redhat
+    liloFlag=elilo
+    isx86=""
+elif [ $ARCH = 'ppc64' -o $ARCH = 'ppc' ]; then
+    liloConfig=/etc/yaboot.conf
+    bootPrefix=/boot
+    lilo=/sbin/ybin
+    kernelName=vmlinux
+    liloFlag=yaboot
+    runLilo="yes"
+    isx86=""
+elif [ $ARCH = 'sparc' -o $ARCH = 'sparc64' ]; then
+    liloConfig=/etc/silo.conf
+    bootPrefix=/boot
+    liloFlag=silo
+    lilo=/sbin/silo
+    isx86=""
+elif [ $ARCH = 's390' -o $ARCH = 's390x' ]; then
+    liloConfig=/etc/zipl.conf
+    bootPrefix=/boot
+    liloFlag=zipl
+    lilo=/sbin/zipl
+    runLilo="yes"
+    isx86=""
+else
+    # this leaves i?86 and x86_64
+    liloConfig=/etc/lilo.conf
+    grubConfig=/boot/grub/grub.conf
+    bootPrefix=/boot
+    liloFlag=lilo
+    isx86="yes"
+fi
+
+mode=""
+version=""
+initrd=""
+initrdfile=""
+moddep=""
+verbose=""
+
+usage() {
+    echo "Usage: `basename $0` [-v] [--mkinitrd] [--rminitrd]" >&2 
+    echo "       [--initrdfile=<initrd-image>] [--depmod] [--rmmoddep]" >&2
+    echo "       [--kernel-args=<args>] [--banner=<banner>]" >&2
+    echo "       <--install | --remove> <kernel-version>" >&2
+    echo "       (ex: `basename $0` --mkinitrd --depmod --install 2.4.7-2)" >&2
+    exit 1
+}
+
+install() {
+    # XXX kernel should be able to be specified also (or work right on ia64)
+    if [ ! -f $bootPrefix/$kernelName-$version ] ; then
+	[ -n "$verbose" ] && echo "kernel for $version does not exist, not running grubby"
+	return
+    fi
+    
+    INITRD=""
+    if [ -f $initrdfile ]; then
+	[ -n "$verbose" ] && echo "found $initrdfile and using it with grubby"
+	INITRD="--initrd $initrdfile"
+    fi
+
+    # FIXME: is this a good heuristic to find out if we're on iSeries?
+    if [ -d /proc/iSeries ]; then
+	[ -n "$verbose" ] && echo "On an iSeries, just making img file"
+	if [ -z $initrdfile  ]; then
+	    [ -n "$verbose" ] && echo "No initrd, just adding system map"
+	    /sbin/addSystemMap $bootPrefix/System.map-$version $bootPrefix/$kernelName-$version $bootPrefix/vmlinitrd-$version
+	else
+	    /sbin/addSystemMap $bootPrefix/System.map-$version $bootPrefix/$kernelName-$version $bootPrefix/vmlinux.sm-$version
+	    /sbin/addRamDisk $initrdfile $bootPrefix/System.map-$version $bootPrefix/vmlinux.sm-$version $bootPrefix/vmlinitrd-$version 2>/dev/null
+	    rm $bootPrefix/vmlinux.sm-$version
+	fi
+	return
+    fi
+
+    # get the root filesystem to use; if it's on a label make sure it's
+    # been configured. if not, get the root device from mount
+    rootdevice=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $1; }}' /etc/fstab)
+    short=$(echo $rootdevice | cut -d= -f1)
+    if [ "$short" == "LABEL" ]; then
+	label=$(echo $rootdevice | cut -d= -f2 |head -n 1)
+	device=$(echo "showlabels" | /sbin/nash  --force --quiet | 
+			awk '$2 == "'$label'" {print $1}')
+	if [ -z "$device" ]; then
+	    rootdevice=$(mount | awk '$3 == "/" { print $1 }')
+	fi
+    fi
+
+    if [ -n "$cfgGrub" ]; then
+	[ -n "$verbose" ] && echo "adding $version to $grubConfig"
+
+	if [ -n "$banner" ]; then
+            title="$banner ($version)"
+	elif [ -f /etc/redhat-release ]; then
+	    title="$(sed 's/ release.*$//' < /etc/redhat-release) ($version)"
+	else
+	    title="Red Hat Linux ($version)"
+	fi
+	/sbin/grubby --add-kernel=$bootPrefix/$kernelName-$version $INITRD    \
+		     --copy-default --title "$title"		    \
+		     --args="root=$rootdevice $kernargs"			    \
+		     --remove-kernel="TITLE=$title"
+    else
+	[ -n "$verbose" ] && echo "$grubConfig does not exist, not running grubby"
+    fi
+
+    if [ -n "$cfgLilo" ]; then
+	[ -n "$verbose" ] && echo "adding $version to $liloConfig"
+
+	/sbin/grubby --add-kernel=$bootPrefix/$kernelName-$version $INITRD    \
+		     --copy-default --title $version		    \
+		     --args="root=$rootdevice $kernargs"			    \
+		     --remove-kernel="TITLE=$version"		    \
+		     --$liloFlag
+
+	if [ -n "$runLilo" ]; then 
+	    [ -n "$verbose" ] && echo "running $lilo"
+	    if [ ! -x $lilo ] ; then
+		[ -n "$verbose" ] && echo "$lilo does not exist"
+	    else
+		$lilo > /dev/null
+	    fi
+	fi
+    else
+	[ -n "$verbose" ] && echo "$liloConfig does not exist, not running grubby"
+    fi
+
+}
+
+remove() {
+    # FIXME: is this a good heuristic to find out if we're on iSeries?
+    if [ -d /proc/iSeries ]; then
+	[ -n "$verbose" ] && echo "On an iSeries, remove img file"
+	rm -f $bootPrefix/$kernelName-$version.img 2>/dev/null
+	return
+    fi
+
+    if [ -n "$cfgGrub" ]; then
+	[ -n "$verbose" ] && echo "removing $version from $grubConfig"
+	/sbin/grubby --remove-kernel=$bootPrefix/$kernelName-$version
+    else
+	[ -n "$verbose" ] && echo "$grubConfig does not exist, not running grubby"
+    fi
+
+    if [ -n "$cfgLilo" ]; then
+	[ -n "$verbose" ] && echo "removing $version from $liloConfig"
+	/sbin/grubby --remove-kernel=$bootPrefix/$kernelName-$version	    \
+		     --$liloFlag
+
+	if [ -n "$runLilo" ]; then 
+	    [ -n "$verbose" ] && echo "running $lilo"
+	    if [ ! -x $lilo ] ; then
+		[ -n "$verbose" ] && echo "$lilo does not exist"
+	    else
+		$lilo > /dev/null
+	    fi
+	fi
+    else
+	[ -n "$verbose" ] && echo "$liloConfig does not exist, not running grubby"
+    fi
+}
+
+mkinitrd() {
+    [ -n "$verbose" ] && echo "creating initrd $initrdfile using $version"
+    /sbin/mkinitrd -f $initrdfile $version
+    rc=$?
+    if [ $rc != 0 ]; then
+	echo "mkinitrd failed" >&2
+	exit 1
+    fi
+}
+
+rminitrd() {
+    [ -n "$verbose" ] && echo "removing initrd $initrdfile"
+    [ -f $initrdfile ] && rm -f $initrdfile
+}
+
+doDepmod() {
+    [ -n "$verbose" ] && echo "running depmod for $version"
+    depmod -ae -F /boot/System.map-$version $version
+}
+
+doRmmoddep() {
+    [ -n "$verbose" ] && echo "removing modules.dep info for $version"
+    [ -d /lib/modules/$version ] && rm -f /lib/modules/$version/modules.*    
+}
+
+
+while [ $# -gt 0 ]; do
+    case $1 in
+	--mkinitrd)
+	    initrd="make"
+	    ;;
+
+	--rminitrd)
+	    initrd="remove"
+	    ;;
+
+	--initrdfile*)
+	    if echo $1 | grep '=' >/dev/null ; then
+	    	initrdfile=`echo $1 | sed 's/^--initrdfile=//'`
+	    else
+		initrdfile=$2
+		shift
+	    fi		    
+	    ;;
+
+	--kernel-args*)
+	    if echo $1 | grep '=' >/dev/null ; then
+	    	kernargs=`echo $1 | sed 's/^--kernel-args=//'`
+	    else
+		kernargs=$2
+		shift
+	    fi		    
+	    ;;
+
+	--banner*)
+	    if echo $1 | grep '=' >/dev/null ; then
+	    	banner=`echo $1 | sed 's/^--banner=//'`
+	    else
+		banner=$2
+		shift
+	    fi		    
+	    ;;
+
+	--depmod)
+	    moddep="make"
+	    ;;
+
+	--rmmoddep)
+	    moddep="remove"
+	    ;;
+
+	-v)
+	    verbose=-v
+	    ;;
+
+	*)
+	    if [ -z "$mode" ]; then
+		mode=$1
+	    elif [ -z "$version" ]; then
+		version=$1
+	    else
+		usage
+	    fi
+	    ;;
+    esac
+
+    shift
+done
+
+# make sure the mode is valid
+if [ "$mode" != "--install" -a "$mode" != "--remove" ] ; then
+    usage
+fi
+
+if [ -z "$version" ]; then
+    usage
+fi
+
+# set the initrd file based on arch; ia64 is the only currently known oddball
+if [ -z "$initrdfile" ]; then
+    if [ `uname -m` = "ia64" ]; then
+	initrdfile="/boot/efi/EFI/redhat/initrd-$version.img"
+    else
+	initrdfile="/boot/initrd-$version.img"
+    fi
+
+fi
+[ -n "$verbose" ] && echo "initrdfile is $initrdfile"
+
+if [ "$moddep" == "make" ]; then
+    doDepmod
+elif [ "$moddep" == "remove" ]; then
+    doRmmoddep
+fi
+
+if [ "$initrd" == "make" ]; then
+    mkinitrd
+elif [ "$initrd" == "remove" ]; then
+    rminitrd
+fi
+
+if [ ! -x $grubby ] ; then
+    [ -n "$verbose" ] && echo "$grubby does not exist"
+    exit 0
+fi
+
+
+[ -n "$grubConfig" ] && [ -f "$grubConfig" ] && cfgGrub=1;
+[ -n "$liloConfig" ] && [ -f "$liloConfig" ] && cfgLilo=1;
+
+# if we have a lilo config on an x86 box, see if the default boot loader
+# is lilo to determine if it should be run
+if [ -n "$cfgLilo" -a -n "$isx86" ]; then
+    runLilo=$($grubby --bootloader-probe | grep lilo)
+fi
+
+if [ "$mode" == "--install" ]; then
+    install
+elif [ "$mode" == "--remove" ]; then
+    remove
+fi
+
+exit 0
diff --git a/sources b/sources
index a6e13ea..a962df6 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
 e457774139c0bfef899359df91f49b3e  memtest86+-2.11.tar.gz
-518763b187bb85249120d06dfebd1235  temp.tar.gz