diff --git a/.cvsignore b/.cvsignore
index d8c4d99..8622415 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,4 +1,4 @@
-cmucl-19e-pre1-x86-linux.tar.bz2
-cmucl-19e-pre1-x86-linux.tar.bz2.asc
-cmucl-src-19e-pre1.tar.bz2
-cmucl-src-19e-pre1.tar.bz2.asc
+cmucl-19e-x86-linux.tar.bz2
+cmucl-19e-x86-linux.tar.bz2.asc
+cmucl-src-19e.tar.bz2
+cmucl-src-19e.tar.bz2.asc
diff --git a/cmucl-19e-optflags.patch b/cmucl-19e-optflags.patch
index 350b7a4..3cbd3b7 100644
--- a/cmucl-19e-optflags.patch
+++ b/cmucl-19e-optflags.patch
@@ -1,12 +1,10 @@
 diff -up cmucl-19e/src/lisp/Config.linux_gencgc.optflags cmucl-19e/src/lisp/Config.linux_gencgc
---- cmucl-19e/src/lisp/Config.linux_gencgc.optflags	2008-02-29 12:02:40.000000000 -0600
-+++ cmucl-19e/src/lisp/Config.linux_gencgc	2008-03-13 11:49:02.000000000 -0500
-@@ -20,9 +20,9 @@ endif
- 
- RUNTIME = $(GENCGC) $(LINKAGE)
- # __NO_CTYPE so builds on glibc 2.3 will run on (some) older glibc's.
--CPPFLAGS = -D__NO_CTYPE -D_GNU_SOURCE -I. -I$(PATH1) -I- -I/usr/X11R6/include $(RUNTIME)
-+CPPFLAGS = -D__NO_CTYPE -D_GNU_SOURCE -iquote . -iquote $(PATH1) $(RUNTIME)
+diff -up cmucl-19e/src/lisp/Config.linux_gencgc.optflags cmucl-19e/src/lisp/Config.linux_gencgc
+--- cmucl-19e/src/lisp/Config.linux_gencgc.optflags	2008-04-01 09:49:18.000000000 -0500
++++ cmucl-19e/src/lisp/Config.linux_gencgc	2008-04-21 09:07:28.000000000 -0500
+@@ -26,7 +26,7 @@ else
+ CPPFLAGS = -D__NO_CTYPE -D_GNU_SOURCE -iquote. -iquote $(PATH1) $(RUNTIME)
+ endif
  
 -CFLAGS = -rdynamic -Wstrict-prototypes -Wall -O2 -g $(RUNTIME)
 +CFLAGS = -rdynamic -Wstrict-prototypes -Wall -O2 -g $(RUNTIME) $(RPM_OPT_FLAGS)
@@ -15,7 +13,7 @@ diff -up cmucl-19e/src/lisp/Config.linux_gencgc.optflags cmucl-19e/src/lisp/Conf
  UNDEFSYMPATTERN = -Xlinker -u -Xlinker &
 diff -up cmucl-19e/src/motif/server/Config.x86.optflags cmucl-19e/src/motif/server/Config.x86
 --- cmucl-19e/src/motif/server/Config.x86.optflags	2007-06-11 09:52:55.000000000 -0500
-+++ cmucl-19e/src/motif/server/Config.x86	2008-03-13 11:41:50.000000000 -0500
++++ cmucl-19e/src/motif/server/Config.x86	2008-04-21 09:06:24.000000000 -0500
 @@ -1,4 +1,4 @@
 -CFLAGS = -O2 -I/usr/X11R6/include -I. -I$(VPATH)
 +CFLAGS = -O2 -I/usr/X11R6/include -I. -I$(VPATH) $(RPM_OPT_FLAGS)
diff --git a/cmucl.spec b/cmucl.spec
index 09abf4b..911195d 100644
--- a/cmucl.spec
+++ b/cmucl.spec
@@ -1,24 +1,25 @@
 
+#define pre_tag pre2
+#define pre -%{pre_tag}
+
 Summary: CMU Common Lisp compiler
 Name: 	 cmucl
 Version: 19e
-Release: 0.2.pre1%{?dist}
+Release: 1%{?dist}
 
 License: BSD 
 Group: 	 Development/Languages
 URL:	 http://www.cons.org/cmucl/
-Source0: http://common-lisp.net/project/cmucl/downloads/release/19e/pre-release/cmucl-src-19e-pre1.tar.bz2
-Source1: http://common-lisp.net/project/cmucl/downloads/release/19e/pre-release/cmucl-src-19e-pre1.tar.bz2.asc
-#Source0: http://common-lisp.net/project/cmucl/downloads/release/%{version}/cmucl-src-%{version}.tar.bz2
-#Source1: http://common-lisp.net/project/cmucl/downloads/release/%{version}/cmucl-src-%{version}.tar.bz2.asc
+Source0: http://common-lisp.net/project/cmucl/downloads/release/%{version}%{?pre:/pre-release}/cmucl-src-%{version}%{?pre}.tar.bz2
+Source1: http://common-lisp.net/project/cmucl/downloads/release/%{version}%{?pre:/pre-release}/cmucl-src-%{version}%{?pre}.tar.bz2.asc
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # bootstrap available for %%ix86 only: http://bugzilla.redhat.com/185085
 ExclusiveArch: %{ix86}
 
 ## ix86 section
-Source10: http://common-lisp.net/project/cmucl/downloads/release/19e/pre-release/cmucl-19e-pre1-x86-linux.tar.bz2
-Source11: http://common-lisp.net/project/cmucl/downloads/release/19e/pre-release/cmucl-19e-pre1-x86-linux.tar.bz2.asc
+Source10: http://common-lisp.net/project/cmucl/downloads/release/19e/cmucl-19e-x86-linux.tar.bz2
+Source11: http://common-lisp.net/project/cmucl/downloads/release/19e/cmucl-19e-x86-linux.tar.bz2.asc
 %ifarch %{ix86}
 %define cmucl_arch x86
 #define bootstrap cmucl 
@@ -113,7 +114,7 @@ Requires: %{name} = %{version}-%{release}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 mkdir -p dist
 pushd dist
@@ -121,28 +122,28 @@ pushd dist
 tar xvjf ../cmucl-%{version}-%{cmucl_arch}-linux.tar.bz2
 tar xvjf ../cmucl-%{version}-%{cmucl_arch}-linux.extra.tar.bz2
 
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/cmucl/
-cp -a bin $RPM_BUILD_ROOT%{_libdir}/cmucl/
-cp -a lib/cmucl $RPM_BUILD_ROOT%{_libdir}/
+mkdir -p %{buildroot}%{_libdir}/cmucl/
+cp -a bin %{buildroot}%{_libdir}/cmucl/
+cp -a lib/cmucl %{buildroot}%{_libdir}/
 
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-install -p man/man1/* $RPM_BUILD_ROOT%{_mandir}/man1/
+mkdir -p %{buildroot}%{_mandir}/man1
+install -p man/man1/* %{buildroot}%{_mandir}/man1/
 popd 
 
 ## Setup app-wrapper
-install -m755 -p -D $RPM_BUILD_ROOT%{_libdir}/cmucl/sample-wrapper $RPM_BUILD_ROOT%{_bindir}/cmucl
+install -m755 -p -D %{buildroot}%{_libdir}/cmucl/sample-wrapper %{buildroot}%{_bindir}/cmucl
 # Fixup paths in wrapper
-sed -i -e "s|^CMUCLLIB=.*|CMUCLLIB=%{_libdir}/cmucl/lib|" $RPM_BUILD_ROOT%{_bindir}/cmucl
-sed -i -e "s|/<<your-cmucl-path>>|%{_libdir}/cmucl|"      $RPM_BUILD_ROOT%{_bindir}/cmucl
+sed -i -e "s|^CMUCLLIB=.*|CMUCLLIB=%{_libdir}/cmucl/lib|" %{buildroot}%{_bindir}/cmucl
+sed -i -e "s|/<<your-cmucl-path>>|%{_libdir}/cmucl|"      %{buildroot}%{_bindir}/cmucl
 # 
-ln -sf cmucl $RPM_BUILD_ROOT%{_bindir}/cmulisp
+ln -sf cmucl %{buildroot}%{_bindir}/cmulisp
 # many apps (ie, maxima) expect to find the wrapper named 'lisp' too
-ln -sf cmucl $RPM_BUILD_ROOT%{_bindir}/lisp
+ln -sf cmucl %{buildroot}%{_bindir}/lisp
 
 ## Unpackaged files
-rm -f $RPM_BUILD_ROOT%{_libdir}/cmucl/sample-wrapper
+rm -f %{buildroot}%{_libdir}/cmucl/sample-wrapper
 
-# lisp.core contains environment used to build, including RPM_BUILD_ROOT
+# lisp.core contains environment used to build, including %{buildroot} 
 QA_SKIP_BUILD_ROOT=1; export QA_SKIP_BUILD_ROOT
 
 
@@ -189,11 +190,17 @@ QA_SKIP_BUILD_ROOT=1; export QA_SKIP_BUILD_ROOT
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %changelog
-* Fri Mar 14 2008 Rex Dieter <rdieter@fedoraproject.org> 19e-0.2.pre2
+* Mon Jun 16 2008 Rex Dieter <rdieter@fedoraproject.org> 19e-1
+- cmucl-19e (final)
+
+* Mon Apr 21 2008 Rex Dieter <rdieter@fedoraproject.org> 19e-0.3.pre2
+- cmucl-19e-pre2
+
+* Fri Mar 14 2008 Rex Dieter <rdieter@fedoraproject.org> 19e-0.2.pre1
 - gcc43 patch
 
 * Thu Mar 13 2008 Rex Dieter <rdieter@fedoraproject.org> 19e-0.1.pre1
diff --git a/sources b/sources
index 3979987..8dde472 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-f57b265985c20b98405419352ea16767  cmucl-19e-pre1-x86-linux.tar.bz2
-97143606cacf2bfc31ffbcbe54f9b93d  cmucl-19e-pre1-x86-linux.tar.bz2.asc
-d106f931038438e10ee4d73ec753c6a7  cmucl-src-19e-pre1.tar.bz2
-398b9623dac8f47ebd1ecf1f6e0fb9fe  cmucl-src-19e-pre1.tar.bz2.asc
+d88262b3a6d65a83683290e5fd4097b3  cmucl-19e-x86-linux.tar.bz2
+cb9982e357b89a67eb7579a8f111bbd3  cmucl-19e-x86-linux.tar.bz2.asc
+f6e236bc404afc3952b36a3fd6d8ec79  cmucl-src-19e.tar.bz2
+e88c9ca855c22506cf3e34cddc417929  cmucl-src-19e.tar.bz2.asc