diff --git a/libavc1394.changes b/libavc1394.changes
index d938b3b..ed4ac8d 100644
--- a/libavc1394.changes
+++ b/libavc1394.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Sat Nov 14 22:10:12 UTC 2015 - jengelh@inai.de
+
+- Update groups and trim descriptions.
+- Remove redundant --with-pic; shared libraries always get it
+  anyway.
+- Name the utility package -tools as with many other pkgs.
+  Set its license.
+
 -------------------------------------------------------------------
 Sat Mar 21 07:35:05 UTC 2015 - mpluskal@suse.com
 
diff --git a/libavc1394.spec b/libavc1394.spec
index 3e4ba7d..7b171ec 100644
--- a/libavc1394.spec
+++ b/libavc1394.spec
@@ -19,11 +19,13 @@
 Name:           libavc1394
 Version:        0.5.4
 Release:        0
-Summary:        Libavc1394--Programming Interface to the AV/C Specification
-License:        LGPL-2.1+
-Group:          Development/Libraries/C and C++
+Summary:        Programming Interface to the AV/C Specification
+License:        LGPL-2.1+ and GPL-2.0+
+Group:          System/Libraries
 Url:            http://sourceforge.net/projects/libavc1394/
-Source0:        http://sourceforge.net/projects/libavc1394/files/libavc1394/%{name}-%{version}.tar.gz
+
+#SVN-Clone:	svn://svn.code.sf.net/p/libavc1394/code/trunk
+Source:         http://downloads.sf.net/libavc1394/%name-%version.tar.gz
 Source2:        baselibs.conf
 Patch0:         libavc1394.no-mkrfc2734.patch
 Patch1:         libavc1394.raw1394_set_fcp_handler.patch
@@ -32,46 +34,52 @@ BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  libraw1394-devel
 BuildRequires:  libtool
-BuildRequires:  pkgconfig
+BuildRequires:  pkg-config
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
-Libavc1394 is a programming interface to the AV/C specification from
-the 1394 Trade Association. AV/C stands for Audio/Video Control.
-Currently, applications use the library to control the tape transport
-mechanism on DV camcorders. However, there are many devices and device
-functions that can be controlled via AV/C. Eventually, the library will
-be expanded to implement more of the specification and to provide a
-high level interface to various devices.
+libavc1394 is a programming interface to the AV/C (Audio/Video
+Control) specification. Applications use the library to control the
+tape transport mechanism on DV camcorders. However, there are many
+devices and functions of devices that can be controlled via AV/C.
 
 %package 0
-Summary:        Libavc1394--Programming Interface to the AV/C Specification
-License:        LGPL-2.1+
-Group:          Development/Libraries/C and C++
+Summary:        Programming Interface to the AV/C Specification
+License:        LGPL-2.1+ and GPL-2.0+
+Group:          System/Libraries
 
 %description 0
-Libavc1394 is a programming interface to the AV/C specification from
-the 1394 Trade Association. AV/C stands for Audio/Video Control.
-Currently, applications use the library to control the tape transport
-mechanism on DV camcorders. However, there are many devices and device
-functions that can be controlled via AV/C. Eventually, the library will
-be expanded to implement more of the specification and to provide a
-high level interface to various devices.
+libavc1394 is a programming interface to the AV/C (Audio/Video
+Control) specification. Applications use the library to control the
+tape transport mechanism on DV camcorders. However, there are many
+devices and functions of devices that can be controlled via AV/C.
 
 %package devel
-Summary:        Libavc1394 is a programming interface to the AV/C specification
+Summary:        Development files for libavc1394, a library to the AV/C specification
+License:        LGPL-2.1+ and GPL-2.0+
 Group:          Development/Libraries/C and C++
 Requires:       libavc1394-0 = %{version}
+%if 0%{?suse_version} && 0%{?suse_version} < 1140
+# already autoderived from libavc1394.pc in new-enough rpm
 Requires:       libraw1394-devel
+%endif
 
 %description devel
-libavc1394 is a programming interface to the AV/C specification from
-the 1394 Trade Association. AV/C stands for Audio/Video Control.
-Currently, applications use the library to control the tape transport
-mechanism on DV camcorders. However, there are many devices and
-functions of devices that can be controlled via AV/C. Eventually, the
-library will be expanded to implement more of the specification and to
-provide high level interfaces to various devices.
+libavc1394 is a programming interface to the AV/C (Audio/Video
+Control) specification. Applications use the library to control the
+tape transport mechanism on DV camcorders. However, there are many
+devices and functions of devices that can be controlled via AV/C.
+
+%package tools
+Summary:        Utilities for AV/C 1394
+License:        GPL-2.0+
+Group:          Hardware/Other
+# added on 2015-11-14
+Obsoletes:      %name < %version-%release
+Provides:       %name = %version-%release
+
+%description tools
+Command-line utilities to inspect and control AV/C hardware.
 
 %prep
 %setup -q
@@ -81,20 +89,18 @@ provide high level interfaces to various devices.
 
 %build
 autoreconf -ifv
-%configure \
-	--disable-static \
-	--with-pic
+%configure --disable-static
 make %{?_smp_mflags}
 
 %install
-make DESTDIR=%{buildroot} install %{?_smp_mflags}
+%make_install %{?_smp_mflags}
 find %{buildroot} -type f -name "*.la" -delete -print
 
 %post 0 -p /sbin/ldconfig
 
 %postun 0 -p /sbin/ldconfig
 
-%files
+%files tools
 %defattr(-,root,root)
 %doc README AUTHORS COPYING
 %{_mandir}/man1/*