diff --git a/yasm.changes b/yasm.changes
index 6cdd9c0..9f1839f 100644
--- a/yasm.changes
+++ b/yasm.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue May 29 13:19:48 CEST 2007 - pth@suse.de
+
+- Split off headers and .so symlinks to -devel subpackage.
+
 -------------------------------------------------------------------
 Wed Jan 25 21:43:33 CET 2006 - mls@suse.de
 
diff --git a/yasm.spec b/yasm.spec
index c707716..bc15888 100644
--- a/yasm.spec
+++ b/yasm.spec
@@ -1,28 +1,28 @@
 #
 # spec file for package yasm (Version 0.4.0)
 #
-# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
-# Please submit bugfixes or comments via http://www.suse.de/feedback/
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
 # norootforbuild
 
-Name:         yasm
-URL:          http://www.tortall.net/projects/yasm/
-License:      BSD
-Group:        Development/Languages/Other
-Autoreqprov:  on
-Version:      0.4.0
-Release:      6
-Summary:      YASM is a complete rewrite of the NASM assembler
-Source:       yasm-%{version}.tar.gz
-Patch0:       yasm-genmacro.patch
-Patch1:       yasm-overflow.patch
-Patch2:       yasm-declaration.diff
-BuildRoot:    %{_tmppath}/%{name}-%{version}-build
+Name:           yasm
+URL:            http://www.tortall.net/projects/yasm/
+License:        BSD License and BSD-like
+Group:          Development/Languages/Other
+Autoreqprov:    on
+Version:        0.4.0
+Release:        54
+Summary:        YASM is a complete rewrite of the NASM assembler
+Source:         yasm-%{version}.tar.gz
+Patch0:         yasm-genmacro.patch
+Patch1:         yasm-overflow.patch
+Patch2:         yasm-declaration.diff
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
  	
 
 %description
@@ -34,6 +34,22 @@ Actually it supports ix86 and AMD64, next will be PowerPC
 
 
 
+Authors:
+--------
+    Peter Johnson <peter@tortall.net>
+
+%package devel
+Summary:        YASM development package
+Group:          Development/Languages/Other
+Autoreqprov:    on
+Requires:       %{name} = %{version}
+
+%description devel
+This package includes everything needed to develop programs that use
+libyasm.
+
+
+
 Authors:
 --------
     Peter Johnson <peter@tortall.net>
@@ -45,15 +61,15 @@ Authors:
 %patch2
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" \
-./configure --libdir=%_libdir --prefix=/usr --mandir=%_mandir
+export CFLAGS="%{optflags}" 
+%configure --prefix=/usr --disable-static
 make %{?jobs:-j%jobs}
 
 %install
-make DESTDIR=$RPM_BUILD_ROOT  install 
+make DESTDIR=%buildroot  install 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %buildroot
 
 %post
 %run_ldconfig
@@ -65,14 +81,21 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %doc ABOUT-NLS AUTHORS Artistic.txt BSD.txt COPYING ChangeLog GNU_GPL-2.0
 %doc GNU_LGPL-2.0 INSTALL NEWS README
-%_libdir/lib*
+%_libdir/*.la
+%_libdir/lib*.so.*
 %_libdir/yasm
 /usr/bin/*
-/usr/include/*
 %_mandir/man7/*
 %_mandir/man1/*
 
-%changelog -n yasm
+%files devel
+%defattr(-,root,root)
+/usr/include/*
+%_libdir/lib*.so
+
+%changelog
+* Tue May 29 2007 - pth@suse.de
+- Split off headers and .so symlinks to -devel subpackage.
 * Wed Jan 25 2006 - mls@suse.de
 - converted neededforbuild to BuildRequires
 * Mon Jul 04 2005 - sf@suse.de