diff --git a/baselibs.conf b/baselibs.conf
index 4b40f6a..01ed91c 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -2,3 +2,7 @@ libFLAC8
   obsoletes "flac-<targettype> <= <version>"
   obsoletes "libflac-<targettype> <= <version>"
 libFLAC++6
+flac-devel
+  requires -flac-<targettype>
+  requires "libFLAC8-<targettype> = <version>"
+  requires "libFLAC++6-<targettype> = <version>"
diff --git a/flac.changes b/flac.changes
index 646842f..31e5a34 100644
--- a/flac.changes
+++ b/flac.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sun Sep 18 17:17:12 UTC 2011 - jengelh@medozas.de
+
+- Apply packaging guidelines (remove redundant/obsolete
+  tags/sections from specfile, etc.)
+- Add flac-devel to baselibs
+
 -------------------------------------------------------------------
 Sat Aug  6 04:00:28 UTC 2011 - crrodriguez@opensuse.org
 
diff --git a/flac.spec b/flac.spec
index 61d02a1..0550f07 100644
--- a/flac.spec
+++ b/flac.spec
@@ -15,7 +15,6 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
 
 
 Name:           flac
@@ -46,12 +45,6 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %description
 FLAC is an open source lossless audio codec developed by Josh Coalson.
 
-
-
-Authors:
---------
-    Josh Coalson
-
 %package -n libFLAC8
 Summary:        Free Lossless Audio Codec Library
 License:        BSD3c(or similar)
@@ -63,12 +56,6 @@ Provides:       libflac = %{version}
 This package contains the library for FLAC (Free Lossless Audio Codec)
 developed by Josh Coalson.
 
-
-
-Authors:
---------
-    Josh Coalson
-
 %package -n libFLAC++6
 Summary:        Free Lossless Audio Codec Library
 License:        BSD3c(or similar)
@@ -78,12 +65,6 @@ Group:          System/Libraries
 This package contains the C++ library for FLAC (Free Lossless Audio
 Codec) developed by Josh Coalson.
 
-
-
-Authors:
---------
-    Josh Coalson
-
 %package devel
 Summary:        FLAC Library Development Package
 License:        BSD3c(or similar)
@@ -94,12 +75,6 @@ Requires:       libFLAC8 = %{version} libFLAC++6 = %{version} glibc-devel libstd
 This package contains the files needed to compile programs that use the
 FLAC library.
 
-
-
-Authors:
---------
-    Josh Coalson
-
 %prep
 %setup -q
 %patch
@@ -118,7 +93,7 @@ export CXXFLAGS="$CFLAGS"
 	--disable-static \
 	--disable-rpath \
 	--with-pic
-%{__make} %{?jobs:-j %jobs}
+make %{?_smp_mflags}
 
 %install
 %makeinstall
@@ -142,9 +117,6 @@ make check
 %postun -n libFLAC++6
 %run_ldconfig
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
 %defattr(-, root, root)
 %doc %{_docdir}/%{name}