diff --git a/libglvnd.changes b/libglvnd.changes
index ed2898a..77a9184 100644
--- a/libglvnd.changes
+++ b/libglvnd.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Apr  7 11:09:23 UTC 2017 - jengelh@inai.de
+
+- Replace old $RPM_ shell vars by macros
+- Converge on one style of using macros (drop curlies)
+- RPM group correction
+
 -------------------------------------------------------------------
 Wed Mar 29 08:56:19 UTC 2017 - sndirsch@suse.com
 
diff --git a/libglvnd.spec b/libglvnd.spec
index e931735..109e5e8 100644
--- a/libglvnd.spec
+++ b/libglvnd.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package libglvnd
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -25,17 +25,17 @@ License:        MIT
 Group:          Development/Libraries/C and C++
 Url:            https://github.com/NVIDIA/libglvnd
 # Source is _service generated
-Source:         %{name}-%{version}.tar.gz
+Source:         %name-%version.tar.gz
 Source1:        baselibs.conf
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  libtool
 BuildRequires:  pkgconfig
+BuildRequires:  python-xml
+BuildRequires:  python3-base
+BuildRequires:  pkgconfig(glproto)
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xext)
-BuildRequires:  pkgconfig(glproto)
-BuildRequires:  python3-base
-BuildRequires:  python-xml
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -43,12 +43,12 @@ Vendor-neutral dispatch layer for arbitrating OpenGL API calls between
 multiple vendors on a per-screen basis, as described by Andy Ritger's
 OpenGL ABI proposal.
  
-%package -n %{name}%{sonum}
+%package -n %name%sonum
 Summary:        The GL Vendor-Neutral Dispatch library
-Group:          Development/Libraries/C and C++
+Group:          System/Libraries
 Recommends:     Mesa-libGL1 >= 12.0.0
 
-%description -n %{name}%{sonum}
+%description -n %name%sonum
 Vendor-neutral dispatch layer for arbitrating OpenGL API calls between
 multiple vendors on a per-screen basis, as described by Andy Ritger's
 OpenGL ABI proposal.
@@ -56,7 +56,7 @@ OpenGL ABI proposal.
 %package devel
 Summary:        Development files for libglvnd
 Group:          Development/Libraries/C and C++
-Requires:       %{name}%{sonum} = %{version}
+Requires:       %name%sonum = %version
 Recommends:     Mesa-libGL-devel >= 12.0.0
 
 %description devel
@@ -66,13 +66,13 @@ OpenGL ABI proposal. This package contains the required files for
 development.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q -n %name-%version
 
 %build
 ./autogen.sh
 %configure \
 %if 0%{?suse_version} < 1330
---libdir=/usr/X11R6/%{_lib} \
+--libdir=/usr/X11R6/%_lib \
 %endif
 --disable-static
 
@@ -80,37 +80,37 @@ make %{?_smp_mflags}
 
 %install
 make install DESTDIR="%buildroot";
-> $RPM_BUILD_DIR/%name-%{version}/filelist.rpm
+>%_builddir/%name-%version/filelist.rpm
 %if 0%{?suse_version} < 1330
-rm -f "%buildroot/usr/X11R6/%{_lib}"/*.la
-mkdir -p %buildroot/%{_libdir}/pkgconfig
-mv %buildroot/usr/X11R6/%{_lib}/pkgconfig/*.pc %buildroot/%{_libdir}/pkgconfig
+rm -f "%buildroot/usr/X11R6/%_lib"/*.la
+mkdir -p %buildroot/%_libdir/pkgconfig
+mv %buildroot/usr/X11R6/%_lib/pkgconfig/*.pc %buildroot/%_libdir/pkgconfig
 rm -rf %buildroot/usr/X11R6/pkgconfig
 if [ "%_libdir" == "/usr/lib64" ]; then
-  mkdir -p %buildroot/etc/ld.so.conf.d
-  cat > %buildroot/etc/ld.so.conf.d/%name.conf << EOF
-/usr/X11R6/%{_lib}
+  mkdir -p %buildroot/%_sysconfdir/ld.so.conf.d
+  cat > %buildroot/%_sysconfdir/ld.so.conf.d/%name.conf << EOF
+/usr/X11R6/%_lib
 /usr/X11R6/lib
 EOF
-  echo "%config /etc/ld.so.conf.d/%name.conf" > $RPM_BUILD_DIR/%name-%{version}/filelist.rpm
+  echo "%config %_sysconfdir/ld.so.conf.d/%name.conf" >%_builddir/%name-%version/filelist.rpm
 fi
 %else
-rm -f "%buildroot/%{_libdir}"/*.la
+rm -f "%buildroot/%_libdir"/*.la
 %endif
 
-%post   -n %{name}%{sonum} -p /sbin/ldconfig
+%post   -n %name%sonum -p /sbin/ldconfig
 
-%postun -n %{name}%{sonum} -p /sbin/ldconfig
+%postun -n %name%sonum -p /sbin/ldconfig
 
-%files -n %{name}%{sonum} -f filelist.rpm
+%files -n %name%sonum -f filelist.rpm
 %defattr(-,root,root)
 %doc README.md
 %if 0%{?suse_version} < 1330
 %dir /usr/X11R6
-%dir /usr/X11R6/%{_lib}
-/usr/X11R6/%{_lib}/lib*.so.*
+%dir /usr/X11R6/%_lib
+/usr/X11R6/%_lib/lib*.so.*
 %else
-%{_libdir}/lib*.so.*
+%_libdir/lib*.so.*
 %endif
 
 %files devel
@@ -118,12 +118,12 @@ rm -f "%buildroot/%{_libdir}"/*.la
 %doc README.md
 %if 0%{?suse_version} < 1330
 %dir /usr/X11R6
-%dir /usr/X11R6/%{_lib}
-/usr/X11R6/%{_lib}/lib*.so
+%dir /usr/X11R6/%_lib
+/usr/X11R6/%_lib/lib*.so
 %else
-%{_libdir}/lib*.so
+%_libdir/lib*.so
 %endif
-%{_libdir}/pkgconfig/*.pc
-%{_includedir}/glvnd/
+%_libdir/pkgconfig/*.pc
+%_includedir/glvnd/
 
 %changelog