diff --git a/genwqe-tools.changes b/genwqe-tools.changes
index 903af53..b243930 100644
--- a/genwqe-tools.changes
+++ b/genwqe-tools.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Mar  2 10:42:24 UTC 2017 - Thomas.Blume@suse.com
+
+- stick to the Groups we had before, replace %{__foo} by just foo 
+  and drop the %changelog
+
 -------------------------------------------------------------------
 Wed Feb 22 06:10:55 UTC 2017 - Thomas.Blume@suse.com
 
diff --git a/genwqe-tools.spec b/genwqe-tools.spec
index 64add72..1203995 100644
--- a/genwqe-tools.spec
+++ b/genwqe-tools.spec
@@ -48,19 +48,19 @@ Provide a suite of utilities to manage and configure the IBM GenWQE card.
 
 %package -n genwqe-zlib
 Summary: GenWQE hardware accelerated libz
-Group: System Environment/Base
+Group: System/Libraries
 %description -n genwqe-zlib
 GenWQE hardware accelerated libz and test-utilities.
 
 %package -n genwqe-vpd
 Summary: GenWQE adapter VPD tools
-Group: System Environment/Base
+Group: System/Libraries
 %description -n genwqe-vpd
 The genwqe-vpd package contains GenWQE adapter VPD tools.
 
 %package        devel
 Summary:        Development files for %{name}
-Group:          Development/Libraries
+Group:          Development/Libraries/C and C++
 Requires:       %{name} = %{version}
 
 %description devel
@@ -80,11 +80,11 @@ mkdir -p ext/libcxl/include/misc/
 cp /usr/include/misc/cxl.h ext/libcxl/include/misc/
 %endif
 
-%{__make} %{?_smp_mflags} tools lib VERSION=%{version} \
+make %{?_smp_mflags} tools lib VERSION=%{version} \
        CONFIG_ZLIB_PATH=/%{_lib}/libz.so.1 %{?libcxl}
 
 %install
-%{__make} %{?_smp_mflags} install DESTDIR=%{buildroot}/%{_prefix} \
+make %{?_smp_mflags} install DESTDIR=%{buildroot}/%{_prefix} \
         VERSION=%{version} SYSTEMD_UNIT_DIR=%{buildroot}/%{_unitdir} \
 	LIB_INSTALL_PATH=%{buildroot}/%{_libdir}/genwqe \
 	INCLUDE_INSTALL_PATH=%{buildroot}/%{_includedir}/genwqe
@@ -95,8 +95,8 @@ cp /usr/include/misc/cxl.h ext/libcxl/include/misc/
 #
 
 # Move genwqe_vpd.csv to expected location.
-%{__mkdir} -p %{buildroot}/%{_sysconfdir}/
-%{__install} -m 0644 tools/genwqe_vpd.csv %{buildroot}/etc/
+mkdir -p %{buildroot}/%{_sysconfdir}/
+install -m 0644 tools/genwqe_vpd.csv %{buildroot}/etc/
 
 %fdupes %{buildroot}%{_bindir}
 
@@ -187,23 +187,3 @@ ln -sf %{_bindir}/genwqe_gzip   %{buildroot}/%{_libdir}/genwqe/gzip
 %{_libdir}/genwqe/*.a
 
 %changelog
-* Thu Jan 05 2017 Frank Haverkamp <haver@linux.vnet.ibm.com> - 4.0.17
-- Make Z_STREAM_END detection circumvention configurable
-- Improve debug output
-- Improve Z_STREAM_END detection and add testcases (most likely not final yet)
-* Wed Apr 06 2016 Gabriel Krisman Bertazi <krisman@linux.vnet.ibm.com> - 4.0.16
-- dlopen uses SONAME when opening libz.
-- Support CAPI version.
-- Bulid fixes.
-- Include genwqe_maint daemon (CAPI version).
-* Mon Apr 04 2016 Frank Haverkamp <haverkam@de.ibm.com>
-- Renamed some scripts again
-* Thu Feb 04 2016 Frank Haverkamp <haverkam@de.ibm.com>
-- Fix s390 and Intel build. Remove debug stuff from zlib rpm.
-* Fri Dec 11 2015 Frank Haverkamp <haverkam@de.ibm.com>
-- Changing some install directories again.
-* Tue Dec 08 2015 Gabriel Krisman Bertazi <krisman@linux.vnet.ibm.com> - 4.0.7-1
-- Create Fedora package.
-- Make genwqe-vpd and genwqe-libz subpackages of genwqe-tools.
-* Wed Apr 22 2015 Frank Haverkamp <haverkam@de.ibm.com>
-- Initial release.