diff --git a/gegl.changes b/gegl.changes
index 26f4f9a..ec72723 100644
--- a/gegl.changes
+++ b/gegl.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Mar  7 10:35:17 UTC 2018 - jengelh@inai.de
+
+- Fix SRPM group. Update descriptions. Remove idempotent
+  %if..%endif around %package.
+
 -------------------------------------------------------------------
 Wed Feb 28 16:26:18 UTC 2018 - dimstar@opensuse.org
 
diff --git a/gegl.spec b/gegl.spec
index 8c498da..9994110 100644
--- a/gegl.spec
+++ b/gegl.spec
@@ -22,8 +22,8 @@ Version:        0.2.0
 Release:        0
 Summary:        Generic Graphics Library
 License:        GPL-3.0-or-later AND LGPL-3.0-or-later
-Group:          System/Libraries
-URL:            http://gegl.org/
+Group:          Productivity/Graphics/Other
+Url:            http://gegl.org/
 Source:         http://ftp.gtk.org/pub/gegl/0.2/%{name}-%{version}.tar.bz2
 # PATCH-FIX-UPSTREAM gegl-lua52.patch bgo#667675 vuntz@opensuse.org -- Fix build with lua 5.2
 Patch0:         gegl-lua52.patch
@@ -83,8 +83,8 @@ Provides:       patched_subset
 %endif
 
 %description
-GEGL provides infrastructure to do demand based cached non destructive
-image editing on larger than RAM buffers. Through babl it provides
+GEGL provides infrastructure to do demand-based cached non-destructive
+image editing on larger than RAM buffers. Through babl, it provides
 support for a wide range of color models and pixel storage formats for
 input and output.
 
@@ -94,41 +94,36 @@ Group:          System/Libraries
 Recommends:     %{name}-0_2-lang
 
 %description 0_2
-GEGL provides infrastructure to do demand based cached non destructive
-image editing on larger than RAM buffers. Through babl it provides
+GEGL provides infrastructure to do demand-based cached non-destructive
+image editing on larger than RAM buffers. Through babl, it provides
 support for a wide range of color models and pixel storage formats for
 input and output.
 
-%if 0%{?BUILD_ORIG}
-%if 0%{?BUILD_ORIG_ADDON}
 %package 0_2-orig-addon
 Summary:        Generic Graphics Library
 Group:          System/Libraries
 Supplements:    packageand(%{name}-0_2:%(cd %{_libdir} ; rpm -qf --queryformat=%%{NAME} `readlink %{_libdir}/libavcodec.so` ))
 
 %description 0_2-orig-addon
-GEGL provides infrastructure to do demand based cached non destructive
-image editing on larger than RAM buffers. Through babl it provides
+GEGL provides infrastructure to do demand-based cached non-destructive
+image editing on larger than RAM buffers. Through babl, it provides
 support for a wide range of color models and pixel storage formats for
 input and output.
 
-%endif
-%endif
-
 %package -n libgegl-0_2-0
 Summary:        Generic Graphics Library
 Group:          System/Libraries
 Recommends:     %{name}-0_2 >= %{version}
 
 %description -n libgegl-0_2-0
-GEGL provides infrastructure to do demand based cached non destructive
-image editing on larger than RAM buffers. Through babl it provides
+GEGL provides infrastructure to do demand-based cached non-destructive
+image editing on larger than RAM buffers. Through babl, it provides
 support for a wide range of color models and pixel storage formats for
 input and output.
 
 %package devel
-Summary:        Generic Graphics Library
-Group:          System/Libraries
+Summary:        Development files for GEGL, the "Generic Graphics Library"
+Group:          Development/Libraries/C and C++
 Requires:       babl-devel
 Requires:       glib2-devel
 Requires:       glibc-devel
@@ -136,22 +131,25 @@ Requires:       libgegl-0_2-0 = %{version}
 Requires:       pcre-devel
 
 %description devel
-GEGL provides infratructure to do demand based cached non destructive
-image editing on larger than RAM buffers. Through babl it provides
+GEGL provides infrastructure to do demand-based cached non-destructive
+image editing on larger than RAM buffers. Through babl, it provides
 support for a wide range of color models and pixel storage formats for
 input and output.
 
+This subpackage contains the C headers for the GEGL API.
+
 %package doc
-Summary:        Generic Graphics Library
-Group:          System/Libraries
-Requires:       libgegl-0_2-0 = %{version}
+Summary:        Documentation for GEGL, the "Generic Graphics Library"
+Group:          Documentation/HTML
 
 %description doc
-GEGL provides infrastructure to do demand based cached non destructive
-image editing on larger than RAM buffers. Through babl it provides
+GEGL provides infrastructure to do demand-based cached non-destructive
+image editing on larger than RAM buffers. Through babl, it provides
 support for a wide range of color models and pixel storage formats for
 input and output.
 
+This subpackage contains the documentation for GEGL.
+
 %lang_package -n %{name}-0_2
 
 %prep