diff --git a/syslinux.spec b/syslinux.spec
index b8035e2..4c7da04 100644
--- a/syslinux.spec
+++ b/syslinux.spec
@@ -2,7 +2,7 @@ Summary: Simple kernel loader which boots from a FAT filesystem
 Name: syslinux
 Version: 3.10
 %define tarball_version 3.10
-Release: 5
+Release: 6
 License: GPL
 Group: Applications/System
 Source0: ftp://ftp.kernel.org/pub/linux/utils/boot/syslinux/%{name}-%{tarball_version}.tar.bz2
@@ -19,26 +19,18 @@ Requires: mtools, libc.so.6
 %ifarch x86_64
 Requires: mtools, libc.so.6()(64bit)
 %endif
+Provides: syslinux-devel
 
 # NOTE: extlinux belongs in /sbin, not in /usr/sbin, since it is typically
 # a system bootloader, and may be necessary for system recovery.
 %define _sbindir /sbin
 
-%package devel
-Summary: Development environment for SYSLINUX add-on modules
-Group: Development/Libraries
-
 %description
 SYSLINUX is a suite of bootloaders, currently supporting DOS FAT
 filesystems, Linux ext2/ext3 filesystems (EXTLINUX), PXE network boots
 (PXELINUX), or ISO 9660 CD-ROMs (ISOLINUX).  It also includes a tool,
 MEMDISK, which loads legacy operating systems from these media.
 
-%description devel
-The SYSLINUX boot loader contains an API, called COM32, for writing
-sophisticated add-on modules.  This package contains the libraries
-necessary to compile such modules.
-
 %prep
 %setup -q -n syslinux-%{tarball_version}
 %patch0 -p1 -b .x86_64
@@ -79,6 +71,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %doc NEWS README* TODO COPYING 
 %doc *.doc memdisk/*.doc
+%doc sample
 %{_bindir}/syslinux
 %{_sbindir}/extlinux
 %{_bindir}/ppmtolss16
@@ -94,13 +87,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_prefix}/lib/syslinux/mkdiskimage
 %{_prefix}/lib/syslinux/syslinux
 %{_prefix}/lib/syslinux/syslinux-nomtools
-
-%files devel
-%defattr(-,root,root)
-%doc sample
 %{_prefix}/lib/syslinux/com32
 
 %changelog
+* Mon Jun 12 2006 Peter Jones <pjones@redhat.com> - 3.10-6
+- Fold -devel subpackage into "syslinux"
+
 * Mon Jun 05 2006 Jesse Keating <jkeating@redhat.com> - 3.10-5
 - Use the actual file as a BuildRequire