diff --git a/cdargs.spec b/cdargs.spec
index 0ccc965..8c4f1f1 100644
--- a/cdargs.spec
+++ b/cdargs.spec
@@ -2,7 +2,7 @@
 
 Name:		cdargs
 Version:	1.35
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	The shell cd with bookmarks and browser
 
 Group:		Applications/File
@@ -13,7 +13,8 @@ Source1:	%{name}-%{version}_emacs-init.el
 Patch0:		%{name}-%{version}_shebangs.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  ncurses-devel
+BuildRequires:	ncurses-devel
+BuildRequires:	emacs
 
 %description
 Enables the user to quickly change working directory by navigating cd arguments
@@ -31,9 +32,10 @@ This package contains development files for %{name}.
 %package -n emacs-cdargs
 Summary:	Cdargs support for Emacs
 Group:		Applications/Editors
+BuildArch:	noarch
 
 Requires:	%{name} = %{version}-%{release}
-Requires:	emacs(bin) >= 22.1-8
+Requires:	emacs(bin) >= %{_emacs_version}
 
 %description -n emacs-cdargs
 This is an Emacs front-end to cdargs. It provides a function (cv or
@@ -41,6 +43,18 @@ cdargs) which uses the same bookmarks list as the terminal program
 cdargs and lets the user quickly make a directory listed there the
 current working directory.
 
+%package -n emacs-cdargs-el
+Summary:	Elisp source files for Cdargs support for Emacs
+Group:		Applications/Editors
+BuildArch:	noarch
+
+Requires:	emacs-%{name} = %{version}-%{release}
+
+%description -n emacs-cdargs-el
+This package contains the Elisp source for providing Cdargs support in
+Emacs. You don't need to install this package to have Emacs support for
+Cdargs. 
+
 %prep
 %setup -q
 %patch0 -p1
@@ -48,16 +62,19 @@ current working directory.
 %build
 %configure
 make %{?_smp_mflags}
+%{_emacs_bytecompile} contrib/cdargs.el
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
 mkdir -p $RPM_BUILD_ROOT%{profiledir}
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d
+mkdir -p $RPM_BUILD_ROOT%{_emacs_sitestartdir}
+mkdir -p $RPM_BUILD_ROOT%{_emacs_sitelispdir}/%{name}
+
+install -p -m 644 contrib/cdargs.el* $RPM_BUILD_ROOT%{_emacs_sitelispdir}/%{name}
+install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_emacs_sitestartdir}/cdargs-init.el
 
-install -p -m 644 contrib/cdargs.el $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/cdargs.el
-install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d/cdargs-init.el
 install -p -m 644 contrib/cdargs-bash.sh $RPM_BUILD_ROOT%{profiledir}/cdargs.sh
 install -p -m 644 contrib/cdargs-tcsh.csh $RPM_BUILD_ROOT%{profiledir}/cdargs.csh
 install -D -p -m 644 src/cdargs.h $RPM_BUILD_ROOT%{_includedir}/cdargs.h
@@ -78,10 +95,20 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n emacs-cdargs
 %defattr(-, root, root, -)
-%{_datadir}/emacs/site-lisp/cdargs.el
-%{_datadir}/emacs/site-lisp/site-start.d/cdargs-init.el
+%dir %{_emacs_sitelispdir}/%{name}
+%{_emacs_sitelispdir}/%{name}/*.elc
+%{_emacs_sitestartdir}/cdargs-init.el
+
+%files -n emacs-cdargs-el
+%defattr(-, root, root, -)
+%{_emacs_sitelispdir}/%{name}/*.el
 
 %changelog
+* Sun Mar 14 2010 Jonathan G. Underwood <jonathan.underwood@gmail.com> - 1.35-6
+- Update spec file to bring it into compliance with Emacs add-on packaging 
+  guidelines
+- Split Elisp source files into separate subpackage
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.35-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild