diff --git a/.cvsignore b/.cvsignore
index e69de29..ec0d8cd 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -0,0 +1 @@
+llvm-2.1.tar.gz
diff --git a/llvm-2.1-fix-sed.patch b/llvm-2.1-fix-sed.patch
new file mode 100644
index 0000000..0291b8f
--- /dev/null
+++ b/llvm-2.1-fix-sed.patch
@@ -0,0 +1,20 @@
+diff -r d001baf31c4b tools/llvm-config/Makefile
+--- a/tools/llvm-config/Makefile	Sat Jan 19 21:47:39 2008 -0800
++++ b/tools/llvm-config/Makefile	Sat Jan 19 21:49:20 2008 -0800
+@@ -57,11 +57,11 @@ llvm-config.in: $(ConfigInIn) $(ConfigSt
+ # Build our final script.
+ $(ToolDir)/llvm-config: llvm-config.in $(FinalLibDeps)
+ 	$(Echo) "Building llvm-config script."
+-	$(Verb) $(ECHO) 's,@LLVM_CPPFLAGS@,$(SUB_CPPFLAGS),' > temp.sed
+-	$(Verb) $(ECHO) 's,@LLVM_CFLAGS@,$(SUB_CFLAGS),' >> temp.sed
+-	$(Verb) $(ECHO) 's,@LLVM_CXXFLAGS@,$(SUB_CXXFLAGS),' >> temp.sed
+-	$(Verb) $(ECHO) 's,@LLVM_LDFLAGS@,$(SUB_LDFLAGS),' >> temp.sed
+-	$(Verb) $(ECHO) 's,@LLVM_BUILDMODE@,$(BuildMode),' >> temp.sed
++	$(Verb) $(ECHO) 's!@LLVM_CPPFLAGS@!$(SUB_CPPFLAGS)!' > temp.sed
++	$(Verb) $(ECHO) 's!@LLVM_CFLAGS@!$(SUB_CFLAGS)!' >> temp.sed
++	$(Verb) $(ECHO) 's!@LLVM_CXXFLAGS@!$(SUB_CXXFLAGS)!' >> temp.sed
++	$(Verb) $(ECHO) 's!@LLVM_LDFLAGS@!$(SUB_LDFLAGS)!' >> temp.sed
++	$(Verb) $(ECHO) 's!@LLVM_BUILDMODE@!$(BuildMode)!' >> temp.sed
+ 	$(Verb) $(SED) -f temp.sed < $< > $@
+ 	$(Verb) $(RM) temp.sed
+ 	$(Verb) cat $(FinalLibDeps) >> $@
diff --git a/llvm.spec b/llvm.spec
new file mode 100644
index 0000000..6418154
--- /dev/null
+++ b/llvm.spec
@@ -0,0 +1,294 @@
+# Build options:
+#
+# --with doxygen
+#   The doxygen docs are HUGE, so they are not built by default.
+#
+# --with gcc
+#   The llvm-gcc package doesn't currently build.
+
+%define lgcc_version 4.2
+
+# LLVM object files don't contain build IDs.  I don't know why yet.
+# Suppress their generation for now.
+%define __debug_install_post echo not building debuginfo 
+
+Name: llvm
+Version: 2.1
+Release: 2%{?dist}
+Summary: The Low Level Virtual Machine
+License: NCSA
+Group: Development/Languages
+URL: http://llvm.org/
+Source0: http://llvm.org/releases/%{version}/llvm-%{version}.tar.gz
+%if %{?_with_gcc:1}%{!?_with_gcc:0}
+Source1: http://llvm.org/releases/%{version}/llvm-gcc%{lgcc_version}-%{version}.source.tar.gz
+%endif
+
+Patch0: llvm-2.1-fix-sed.patch
+
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+BuildRequires: bison
+BuildRequires: chrpath
+BuildRequires: flex
+BuildRequires: gcc-c++ >= 3.4
+BuildRequires: libtool-ltdl-devel
+%if %{?_with_doxygen:1}%{!?_with_doxygen:0}
+BuildRequires: doxygen graphviz
+%endif
+
+%description
+LLVM is a compiler infrastructure designed for compile-time,
+link-time, runtime, and idle-time optimization of programs from
+arbitrary programming languages.  The compiler infrastructure includes
+mirror sets of programming tools as well as libraries with equivalent
+functionality.
+
+%if %{?_with_gcc:1}%{!?_with_gcc:0}
+It currently supports compilation of C and C++ programs, using front
+ends derived from GCC %{lgcc_version}.
+%endif
+
+
+%package devel
+Summary: Libraries and header files for LLVM
+Group: Development/Languages
+Requires: %{name} = %{version}-%{release}
+Requires: libstdc++-devel >= 3.4
+
+
+%description devel
+This package contains library and header files needed to develop new
+native programs that use the LLVM infrastructure.
+
+
+%package doc
+Summary: Documentation for LLVM
+Group: Development/Languages
+Requires: %{name} = %{version}-%{release}
+
+
+%description doc
+Documentation for the LLVM compiler infrastructure.
+
+
+%if %{?_with_gcc:1}%{!?_with_gcc:0}
+
+%package gcc
+Summary: C compiler for LLVM
+License: GPL
+Group: Development/Languages
+Requires: %{name} = %{version}-%{release}
+
+
+%description gcc
+C compiler for LLVM.
+
+
+%package gcc-c++
+Summary: C++ compiler for LLVM
+License: GPL
+Group: Development/Languages
+Requires: %{name}-gcc = %{version}-%{release}
+
+
+%description gcc-c++
+C++ compiler for LLVM.
+
+%endif
+
+
+%if %{?_with_doxygen:1}%{!?_with_doxygen:0}
+%package apidoc
+Summary: API documentation for LLVM
+Group: Development/Languages
+Requires: %{name}-docs = %{version}-%{release}
+
+
+%description apidoc
+API documentation for the LLVM compiler infrastructure.
+%endif
+
+
+%prep
+%setup -q -n llvm-%{version} %{?_with_gcc:-a1}
+
+%patch0 -p1 -b .fix-sed
+
+%build
+# We're not building a debuginfo package yet, because some generated
+# files don't include build IDs.
+cat /dev/null > debugfiles.list
+
+%configure \
+  --libdir=%{_libdir}/%{name} \
+  --datadir=%{_datadir}/%{name}-%{version} \
+  --disable-static \
+  --enable-assertions \
+  --enable-debug-runtime \
+  --enable-jit \
+  --enable-optimized \
+  --enable-shared \
+  --enable-targets=host-only \
+  --with-pic
+make %{_smp_mflags} tools-only VERBOSE=1 OmitFramePointer='' REQUIRES_EH=1 \
+  OPTIMIZE_OPTION='%{optflags}'
+
+%if %{?_with_gcc:1}%{!?_with_gcc:0}
+# Build llvm-gcc.
+
+export PATH=%{_builddir}/%{?buildsubdir}/Release/bin:$PATH
+
+mkdir llvm-gcc%{lgcc_version}-%{version}.source/build
+cd llvm-gcc%{lgcc_version}-%{version}.source/build
+
+../configure \
+  --host=%{_host} \
+  --build=%{_build} \
+  --target=%{_target_platform} \
+  --prefix=%{_libdir}/llvm-gcc \
+  --libdir=%{_libdir}/llvm-gcc/%{_lib} \
+  --enable-threads \
+  --disable-nls \
+%ifarch x86_64
+  --disable-multilib \
+  --disable-shared \
+%endif
+  --enable-languages=c,c++ \
+  --enable-llvm=%{_builddir}/%{?buildsubdir} \
+  --program-prefix=llvm-
+make %{_smp_mflags} LLVM_VERSION_INFO=%{version}
+%endif
+
+%install
+rm -rf %{buildroot}
+chmod -x examples/Makefile
+make install \
+  PROJ_prefix=%{buildroot}/%{_prefix} \
+  PROJ_bindir=%{buildroot}/%{_bindir} \
+  PROJ_libdir=%{buildroot}/%{_libdir}/%{name} \
+  PROJ_datadir=%{buildroot}/%{_datadir} \
+  PROJ_docsdir=%{buildroot}/%{_docdir}/%{name}-%{version} \
+  PROJ_etcdir=%{buildroot}/%{_datadir}/%{name}-%{version} \
+  PROJ_includedir=%{buildroot}/%{_includedir} \
+  PROJ_infodir=%{buildroot}/%{_infodir} \
+  PROJ_mandir=%{buildroot}/%{_mandir}
+find %{buildroot} -name .dir -print0 | xargs -0r rm -f
+file %{buildroot}/%{_bindir}/* | awk -F: '$2~/ELF/{print $1}' | xargs -r chrpath -d
+
+# Get rid of erroneously installed example files.
+rm %{buildroot}%{_libdir}/%{name}/LLVMHello.*
+
+# Remove deprecated tools.
+rm %{buildroot}%{_bindir}/gcc{as,ld}
+
+sed -i 's,ABS_RUN_DIR/lib",ABS_RUN_DIR/%{_lib}/%{name}",' \
+  %{buildroot}%{_bindir}/llvm-config
+
+chmod -x %{buildroot}%{_libdir}/%{name}/*.[oa]
+
+%if %{?_with_gcc:1}%{!?_with_gcc:0}
+# Install llvm-gcc.
+
+make -C llvm-gcc%{lgcc_version}-%{version}.source/build install DESTDIR=%{buildroot}
+cd %{buildroot}%{_libdir}/llvm-gcc/%{_lib}
+find . -name '*.la' -print0 | xargs -0r rm
+find . -name '*.a' -exec %{buildroot}%{_bindir}/llvm-ranlib {} \;
+cd ../bin
+ln llvm-c++ llvm-gcc llvm-g++ %{buildroot}%{_bindir}
+rm llvm-cpp llvm-gccbug llvm-gcov %{_target_platform}-gcc*
+cd ..
+mv man/man1/llvm-gcc.1 man/man1/llvm-g++.1 %{buildroot}%{_mandir}/man1
+rm -r info man %{_lib}/libiberty.a
+rm -r libexec/gcc/%{_target_platform}/%{lgcc_version}/install-tools
+rm -r %{_lib}/gcc/%{_target_platform}/%{lgcc_version}/install-tools
+%endif
+
+%clean
+rm -rf %{buildroot}
+
+
+%post -p /sbin/ldconfig
+
+
+%postun -p /sbin/ldconfig
+
+
+%files
+%defattr(-,root,root,-)
+%doc CREDITS.TXT LICENSE.TXT README.txt
+%exclude %{_bindir}/llvm-config
+%{_bindir}/bugpoint
+%{_bindir}/llc
+%{_bindir}/lli
+%{_bindir}/llvm*
+%{_bindir}/opt
+%doc %{_mandir}/man1/*.1.gz
+
+%if %{?_with_doxygen:1}%{!?_with_doxygen:0}
+%exclude %{_bindir}/llvm-[cg]++
+%exclude %{_bindir}/llvm-gcc
+%exclude %{_mandir}/man1/llvm-[cg]++.*
+%exclude %{_mandir}/man1/llvm-gcc.*
+%endif
+
+
+%files devel
+%defattr(-,root,root,-)
+%{_bindir}/llvm-config
+%{_datadir}/%{name}-%{version}
+%{_includedir}/%{name}
+%{_includedir}/%{name}-c
+%{_libdir}/%{name}
+
+
+%files doc
+%defattr(-,root,root,-)
+%doc docs/*.{html,css} docs/img examples
+
+
+%if %{?_with_doxygen:1}%{!?_with_doxygen:0}
+%files apidoc
+%defattr(-,root,root,-)
+%doc docs/doxygen
+%endif
+
+
+%if %{?_with_gcc:1}%{!?_with_gcc:0}
+%files gcc
+%defattr(-,root,root,-)
+%{_bindir}/llvm-gcc
+%dir %{_libdir}/llvm-gcc
+%dir %{_libdir}/llvm-gcc/bin
+%dir %{_libdir}/llvm-gcc/include
+%dir %{_libdir}/llvm-gcc/%{_lib}
+%dir %{_libdir}/llvm-gcc/libexec
+%dir %{_libdir}/llvm-gcc/libexec/gcc
+%dir %{_libdir}/llvm-gcc/libexec/gcc/%{_target_platform}/%{lgcc_version}
+%{_libdir}/llvm-gcc/%{_lib}/gcc
+%{_libdir}/llvm-gcc/%{_lib}/libmudflap*.a
+%{_libdir}/llvm-gcc/bin/%{_target_platform}-llvm-gcc
+%{_libdir}/llvm-gcc/bin/llvm-gcc
+%{_libdir}/llvm-gcc/include/mf-runtime.h
+%{_libdir}/llvm-gcc/libexec/gcc/%{_target_platform}/%{lgcc_version}/cc1
+%{_libdir}/llvm-gcc/libexec/gcc/%{_target_platform}/%{lgcc_version}/collect2
+%doc %{_mandir}/man1/llvm-gcc.*
+
+
+%files gcc-c++
+%defattr(-,root,root,-)
+%{_bindir}/llvm-[cg]++
+%{_libdir}/llvm-gcc/%{_lib}/lib*++.a
+%{_libdir}/llvm-gcc/bin/%{_target_platform}-llvm-[cg]++
+%{_libdir}/llvm-gcc/bin/llvm-[cg]++
+%{_libdir}/llvm-gcc/include/c++
+%{_libdir}/llvm-gcc/libexec/gcc/%{_target_platform}/%{lgcc_version}/cc1plus
+%doc %{_mandir}/man1/llvm-g++.*
+%endif
+
+
+%changelog
+* Sun Jan 20 2008 Bryan O'Sullivan <bos@serpentine.com> - 2.1-2
+- Fix review comments
+
+* Sun Jan 20 2008 Bryan O'Sullivan <bos@serpentine.com> - 2.1-1
+- Initial version
diff --git a/sources b/sources
index e69de29..4fd5de2 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+b930e7213b37acc934d0d163cf13af18  llvm-2.1.tar.gz