diff --git a/.cvsignore b/.cvsignore
index 69bf89b..d8c4d99 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,7 +1,4 @@
-cmucl-19c-x86-linux.tar.bz2
-cmucl-19c-x86-linux.tar.bz2.asc
-cmucl-19d-x86-linux.tar.bz2
-cmucl-19d-x86-linux.tar.bz2.asc
-cmucl-src-19c.tar.bz2
-cmucl-src-19c.tar.bz2.asc
-cmucl-src-19d.tar.bz2
+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
diff --git a/cmucl-19c-motif-shared.patch b/cmucl-19c-motif-shared.patch
deleted file mode 100644
index 4580cac..0000000
--- a/cmucl-19c-motif-shared.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cmucl-19/src/motif/server/Config.x86.motif-shared	2004-04-26 07:07:36.000000000 -0500
-+++ cmucl-19/src/motif/server/Config.x86	2004-08-04 12:59:32.209585248 -0500
-@@ -1,6 +1,6 @@
--CFLAGS = -O2 -I/usr/X11R6/include -I. -I$(VPATH)
-+CFLAGS = -O2 $(RPM_OPT_FLAGS) -I/usr/X11R6/include -I. -I$(VPATH)
- LDFLAGS = -L/usr/X11R6/lib
--LIBS = -static -lXm -dynamic -lXt -lXext -lX11 -lSM -lICE -lXp -ldl -lpthread
-+LIBS = -lXm
- # This def assumes you are building in the same or parallel
- # tree to the CVS souce layout. Sites may need to customize
- # this path.
diff --git a/cmucl-19c-optflags.patch b/cmucl-19c-optflags.patch
deleted file mode 100644
index a2395a2..0000000
--- a/cmucl-19c-optflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cmucl-19c/src/lisp/Config.linux_gencgc.optflags	2005-09-19 23:02:28.000000000 -0500
-+++ cmucl-19c/src/lisp/Config.linux_gencgc	2005-10-21 07:20:49.000000000 -0500
-@@ -21,7 +21,7 @@
- RUNTIME = $(GENCGC) $(LINKAGE)
- # __NO_CTYPE so builds on glibc 2.3 will run on (some) older glibc's.
- CPPFLAGS = -D__NO_CTYPE -I. -I$(PATH1) -I- -I/usr/X11R6/include $(RUNTIME)
--CFLAGS = -rdynamic -Wstrict-prototypes -Wall -g $(RUNTIME)
-+CFLAGS = -rdynamic -Wstrict-prototypes -Wall -g $(RUNTIME) $(RPM_OPT_FLAGS)
- ASFLAGS = -g -DGENCGC -DLINKAGE_TABLE
- NM = $(PATH1)/linux-nm
- UNDEFSYMPATTERN = -Xlinker -u -Xlinker &
diff --git a/cmucl-19e-optflags.patch b/cmucl-19e-optflags.patch
new file mode 100644
index 0000000..350b7a4
--- /dev/null
+++ b/cmucl-19e-optflags.patch
@@ -0,0 +1,24 @@
+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)
+ 
+-CFLAGS = -rdynamic -Wstrict-prototypes -Wall -O2 -g $(RUNTIME)
++CFLAGS = -rdynamic -Wstrict-prototypes -Wall -O2 -g $(RUNTIME) $(RPM_OPT_FLAGS)
+ ASFLAGS = -g $(GENCGC) $(LINKAGE_TABLE)
+ NM = $(PATH1)/linux-nm
+ 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
+@@ -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)
+ LDFLAGS = -L/usr/X11R6/lib
+ LIBS = -lXm -lXt -lXext -lX11 -lSM -lICE -lXp -ldl -lpthread
+ # This def assumes you are building in the same or parallel
diff --git a/cmucl.spec b/cmucl.spec
index 0f469f9..1030490 100644
--- a/cmucl.spec
+++ b/cmucl.spec
@@ -1,13 +1,15 @@
 
 Summary: CMU Common Lisp compiler
 Name: 	 cmucl
-Version: 19d
-Release: 6%{?dist}
+Version: 19e
+Release: 0.1.pre1%{?dist}
 
 License: BSD 
 Group: 	 Development/Languages
 URL:	 http://www.cons.org/cmucl/
-Source0: http://common-lisp.net/project/cmucl/downloads/release/%{version}/cmucl-src-%{version}.tar.bz2
+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
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -15,11 +17,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExclusiveArch: %{ix86}
 
 ## ix86 section
-#Source10: http://common-lisp.net/project/cmucl/downloads/release/19d/cmucl-19d-x86-linux.tar.bz2
-#Source11: http://common-lisp.net/project/cmucl/downloads/release/19d/cmucl-19d-x86-linux.tar.bz2.asc
+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
 %ifarch %{ix86}
 %define cmucl_arch x86
-%define bootstrap cmucl 
+#define bootstrap cmucl 
 %if "%{?bootstrap}" == "%{nil}"
 %define bootstrap_src -a 10 
 %else
@@ -35,8 +37,7 @@ BuildRequires: cmucl >= 19d
 #ifarch ppc
 #endif
 
-Patch1: cmucl-19c-motif-shared.patch
-Patch2: cmucl-19c-optflags.patch
+Patch2: cmucl-19e-optflags.patch
 
 BuildRequires: sed
 BuildRequires: time
@@ -70,7 +71,6 @@ Requires: %{name} = %{version}-%{release}
 %prep
 %setup -q -c %{name}-%{version} %{?bootstrap_src}
 
-%patch1 -p1 -b .motif-shared
 %patch2 -p1 -b .optflags
 
 
@@ -116,8 +116,8 @@ rm -rf $RPM_BUILD_ROOT
 mkdir -p dist
 pushd dist
 # unarchive newly creating binary dist archives
-tar xvzf ../cmucl-%{version}-%{cmucl_arch}-linux.tar.gz
-tar xvzf ../cmucl-%{version}-%{cmucl_arch}-linux.extra.tar.gz
+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/
@@ -145,7 +145,7 @@ QA_SKIP_BUILD_ROOT=1; export QA_SKIP_BUILD_ROOT
 
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc dist/doc/cmucl/README dist/doc/cmucl/release*.txt
 %{_bindir}/cmucl
 %{_bindir}/cmulisp
@@ -158,8 +158,13 @@ QA_SKIP_BUILD_ROOT=1; export QA_SKIP_BUILD_ROOT
 %{_libdir}/cmucl/lib/load-foreign.csh
 %{_libdir}/cmucl/lib/config
 %{_libdir}/cmucl/lib/config.lisp
+%{_libdir}/cmucl/lib/ext-formats/
 %{_libdir}/cmucl/lib/generic-site.lisp
+%{_libdir}/cmucl/lib/Linux-cmucl-linker-script
+%{_libdir}/cmucl/lib/linker.sh
+%{_libdir}/cmucl/lib/lisp.a
 %dir %{_libdir}/cmucl/lib/subsystems
+%{_libdir}/cmucl/lib/subsystems/external-formats-library.*
 %{_libdir}/cmucl/lib/subsystems/gray-*-library.*
 %{_libdir}/cmucl/lib/subsystems/iodefs-library.*
 %{_libdir}/cmucl/lib/subsystems/simple-*-library.*
@@ -169,7 +174,7 @@ QA_SKIP_BUILD_ROOT=1; export QA_SKIP_BUILD_ROOT
 %{_mandir}/man1/*
 
 %files extras
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_libdir}/cmucl/lib/subsystems/clx-library.*
 %{_libdir}/cmucl/lib/subsystems/hemlock-library.*
 %{_libdir}/cmucl/lib/subsystems/clm-library.*
@@ -186,6 +191,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Mar 13 2008 Rex Dieter <rdieter@fedoraproject.org> 19e-0.1.pre1
+- cmucl-19e-pre1
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 19d-6
 - Autorebuild for GCC 4.3
 
diff --git a/sources b/sources
index c39b777..3979987 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,4 @@
-806b3c1a9f68caa9106a5d03cf7bebce  cmucl-19d-x86-linux.tar.bz2.asc
-802cd8b05e376ff04c9006dd04f5bc7e  cmucl-19d-x86-linux.tar.bz2
-3a3dba371a7e1db7fa4b8f338acd72a3  cmucl-src-19d.tar.bz2
+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