diff --git a/libinstpatch.changes b/libinstpatch.changes
index 43f55b2..f810d5e 100644
--- a/libinstpatch.changes
+++ b/libinstpatch.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Oct  6 16:35:46 UTC 2017 - jengelh@inai.de
+
+- Add missing RPM groups. Move description to where it matters.
+  Avoid shipping documentation twice.
+
 -------------------------------------------------------------------
 Sat Aug  5 20:10:50 UTC 2017 - jkraehemann@gmail.com
 
diff --git a/libinstpatch.spec b/libinstpatch.spec
index e94f54c..ae93d5c 100644
--- a/libinstpatch.spec
+++ b/libinstpatch.spec
@@ -21,6 +21,7 @@ Version:        1.0.0
 Release:        0
 Summary:        MIDI instrument patch library
 License:        LGPL-2.1+
+Group:          Development/Libraries/C and C++
 Url:            http://www.swamiproject.org/
 # Fetch source via
 # sh libinstpatch-snapshot.sh latest
@@ -34,28 +35,31 @@ BuildRequires:  glib2-devel
 BuildRequires:  libsndfile-devel
 
 %description
+libInstPatch is a library for processing digital sample based MIDI
+instrument "patch" files.
+
+%package -n libinstpatch-1_0-0
+Summary:        Libinstpatch library
+Group:          System/Libraries
+
+%description -n libinstpatch-1_0-0
 libInstPatch stands for lib-Instrument-Patch and is a library for processing
 digital sample based MIDI instrument "patch" files. The types of files
 libInstPatch supports are used for creating instrument sounds for wavetable
 synthesis. libInstPatch provides an object framework (based on GObject) to load
 patch files into, which can then be edited, converted, compressed and saved.
 
-%package -n libinstpatch-1_0-0
-Summary:        Libinstpatch library
-
-%description -n libinstpatch-1_0-0
-This package contains the SO library of %{name}.
+This package contains the library of %{name}.
 
 %package devel
 Summary:        Development package for %{name}
-Group:          Development/LAnguages/C and C++
+Group:          Development/Languages/C and C++
 Requires:       glib2-devel
 Requires:       libinstpatch-1_0-0 = %{version}
 Requires:       libsndfile-devel
 
 %description devel
-This package includes the development libraries and header files for
-%{name}.
+This package includes the header files for %{name}.
 
 %prep
 %setup -q
@@ -66,7 +70,7 @@ This package includes the development libraries and header files for
 make %{?_smp_mflags}
 
 %install
-make install DESTDIR=%{buildroot} -C build
+%cmake_install
 
 %post -n libinstpatch-1_0-0 -p /sbin/ldconfig
 %postun -n libinstpatch-1_0-0 -p /sbin/ldconfig
@@ -76,7 +80,7 @@ make install DESTDIR=%{buildroot} -C build
 %{_libdir}/%{name}*.so.*
 
 %files devel
-%doc AUTHORS ChangeLog COPYING NEWS README
+%doc AUTHORS ChangeLog NEWS README
 %doc examples/create_sf2.c
 %{_includedir}/%{name}*
 %{_libdir}/%{name}*.so