diff --git a/.cvsignore b/.cvsignore
index e69de29..1bfaff8 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -0,0 +1 @@
+libXaw-0.99.0.tar.bz2
diff --git a/libXaw.spec b/libXaw.spec
new file mode 100644
index 0000000..df2ad21
--- /dev/null
+++ b/libXaw.spec
@@ -0,0 +1,180 @@
+%define pkgname libXaw
+Summary: X.Org X11 libXaw runtime library
+Name: xorg-x11-%{pkgname}
+Version: 0.99.0
+Release: 4
+License: MIT/X11
+Group: System Environment/Libraries
+URL: http://www.x.org
+Source0: %{pkgname}-%{version}.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+
+BuildRequires: xorg-x11-proto-devel
+BuildRequires: xorg-x11-libX11-devel
+BuildRequires: xorg-x11-libXt-devel
+BuildRequires: xorg-x11-libXmu-devel
+BuildRequires: xorg-x11-libXpm-devel
+# configure doesn't complain about libXext missing, but the build fails
+# without it.
+BuildRequires: xorg-x11-libXext-devel
+
+Provides: %{pkgname}
+Conflicts: XFree86-libs, xorg-x11-libs
+
+%description
+X.Org X11 libXaw runtime library
+
+%package devel
+Summary: X.Org X11 libXaw development package
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: xorg-x11-libXmu-devel
+
+Provides: %{pkgname}-devel
+Conflicts: XFree86-devel, xorg-x11-devel
+
+%description devel
+X.Org X11 libXaw development package
+
+%prep
+%setup -q -c %{name}-%{version}
+
+%build
+cd %{pkgname}-%{version}
+%configure --disable-xaw8
+make
+
+%install
+rm -rf $RPM_BUILD_ROOT
+cd %{pkgname}-%{version}
+%makeinstall
+
+# We intentionally don't ship *.la files
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+%files
+%defattr(-,root,root,-)
+%doc
+%dir %{_libdir}
+%{_libdir}/libXaw6.so.6
+%{_libdir}/libXaw6.so.6.0.1
+%{_libdir}/libXaw7.so.7
+%{_libdir}/libXaw7.so.7.0.0
+
+%files devel
+%dir %{_includedir}/X11
+%dir %{_includedir}/X11/Xaw
+%{_includedir}/X11/Xaw/AllWidgets.h
+%{_includedir}/X11/Xaw/AsciiSink.h
+%{_includedir}/X11/Xaw/AsciiSinkP.h
+%{_includedir}/X11/Xaw/AsciiSrc.h
+%{_includedir}/X11/Xaw/AsciiSrcP.h
+%{_includedir}/X11/Xaw/AsciiText.h
+%{_includedir}/X11/Xaw/AsciiTextP.h
+%{_includedir}/X11/Xaw/Box.h
+%{_includedir}/X11/Xaw/BoxP.h
+%{_includedir}/X11/Xaw/Cardinals.h
+%{_includedir}/X11/Xaw/Command.h
+%{_includedir}/X11/Xaw/CommandP.h
+%{_includedir}/X11/Xaw/Dialog.h
+%{_includedir}/X11/Xaw/DialogP.h
+%{_includedir}/X11/Xaw/Form.h
+%{_includedir}/X11/Xaw/FormP.h
+%{_includedir}/X11/Xaw/Grip.h
+%{_includedir}/X11/Xaw/GripP.h
+%{_includedir}/X11/Xaw/Label.h
+%{_includedir}/X11/Xaw/LabelP.h
+%{_includedir}/X11/Xaw/List.h
+%{_includedir}/X11/Xaw/ListP.h
+%{_includedir}/X11/Xaw/MenuButtoP.h
+%{_includedir}/X11/Xaw/MenuButton.h
+%{_includedir}/X11/Xaw/MultiSink.h
+%{_includedir}/X11/Xaw/MultiSinkP.h
+%{_includedir}/X11/Xaw/MultiSrc.h
+%{_includedir}/X11/Xaw/MultiSrcP.h
+%{_includedir}/X11/Xaw/Paned.h
+%{_includedir}/X11/Xaw/PanedP.h
+%{_includedir}/X11/Xaw/Panner.h
+%{_includedir}/X11/Xaw/PannerP.h
+%{_includedir}/X11/Xaw/Porthole.h
+%{_includedir}/X11/Xaw/PortholeP.h
+%{_includedir}/X11/Xaw/Repeater.h
+%{_includedir}/X11/Xaw/RepeaterP.h
+%{_includedir}/X11/Xaw/Reports.h
+%{_includedir}/X11/Xaw/Scrollbar.h
+%{_includedir}/X11/Xaw/ScrollbarP.h
+%{_includedir}/X11/Xaw/Simple.h
+%{_includedir}/X11/Xaw/SimpleMenP.h
+%{_includedir}/X11/Xaw/SimpleMenu.h
+%{_includedir}/X11/Xaw/SimpleP.h
+%{_includedir}/X11/Xaw/Sme.h
+%{_includedir}/X11/Xaw/SmeBSB.h
+%{_includedir}/X11/Xaw/SmeBSBP.h
+%{_includedir}/X11/Xaw/SmeLine.h
+%{_includedir}/X11/Xaw/SmeLineP.h
+%{_includedir}/X11/Xaw/SmeP.h
+%{_includedir}/X11/Xaw/StripCharP.h
+%{_includedir}/X11/Xaw/StripChart.h
+%{_includedir}/X11/Xaw/Template.h
+%{_includedir}/X11/Xaw/TemplateP.h
+%{_includedir}/X11/Xaw/Text.h
+%{_includedir}/X11/Xaw/TextP.h
+%{_includedir}/X11/Xaw/TextSink.h
+%{_includedir}/X11/Xaw/TextSinkP.h
+%{_includedir}/X11/Xaw/TextSrc.h
+%{_includedir}/X11/Xaw/TextSrcP.h
+%{_includedir}/X11/Xaw/Tip.h
+%{_includedir}/X11/Xaw/TipP.h
+%{_includedir}/X11/Xaw/Toggle.h
+%{_includedir}/X11/Xaw/ToggleP.h
+%{_includedir}/X11/Xaw/Tree.h
+%{_includedir}/X11/Xaw/TreeP.h
+%{_includedir}/X11/Xaw/VendorEP.h
+%{_includedir}/X11/Xaw/Viewport.h
+%{_includedir}/X11/Xaw/ViewportP.h
+%{_includedir}/X11/Xaw/XawImP.h
+%{_includedir}/X11/Xaw/XawInit.h
+%{_libdir}/libXaw.so
+%{_libdir}/libXaw6.a
+%{_libdir}/libXaw6.so
+%{_libdir}/libXaw7.a
+%{_libdir}/libXaw7.so
+%dir %{_libdir}/pkgconfig
+%{_libdir}/pkgconfig/xaw6.pc
+%{_libdir}/pkgconfig/xaw7.pc
+%dir %{_datadir}/aclocal
+%{_datadir}/aclocal/xaw.m4
+%dir %{_mandir}/man3
+%{_mandir}/man3/Xaw.3*
+
+%changelog
+* Wed Aug 25 2005 Mike A. Harris <mharris@redhat.com> 0.99.0-4
+- Added dependency on xorg-x11-libXmu-devel to devel subpackage, as libXaw
+  headers include libXmu headers directly which caused xkbutils to fail to
+  build.
+
+* Wed Aug 24 2005 Mike A. Harris <mharris@redhat.com> 0.99.0-3
+- Changed all virtual BuildRequires to the "xorg-x11-" prefixed non-virtual
+  package names, as we want xorg-x11 libs to explicitly build against
+  X.Org supplied libs, rather than "any implementation", which is what the
+  virtual provides is intended for.
+
+* Tue Aug 23 2005 Mike A. Harris <mharris@redhat.com> 0.99.0-2
+- Renamed package to prepend "xorg-x11" to the name for consistency with
+  the rest of the X11R7 packages.
+- Added "Requires: %%{name} = %%{version}-%%{release}" dependency to devel
+  subpackage to ensure the devel package matches the installed shared libs.
+- Added virtual "Provides: lib<name>" and "Provides: lib<name>-devel" to
+  allow applications to use implementation agnostic dependencies.
+- Added post/postun scripts which call ldconfig.
+- Added Conflicts with XFree86-libs and xorg-x11-libs to runtime package,
+  and Conflicts with XFree86-devel and xorg-x11-devel to devel package.
+
+* Mon Aug 22 2005 Mike A. Harris <mharris@redhat.com> 0.99.0-1
+- Initial build.
diff --git a/sources b/sources
index e69de29..960225d 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+84b2766703f7b1d150edc21b338856de  libXaw-0.99.0.tar.bz2