diff --git a/hollywood.changes b/hollywood.changes
index 5411648..e8c3495 100644
--- a/hollywood.changes
+++ b/hollywood.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Feb  3 16:10:33 UTC 2017 - jengelh@inai.de
+
+- Set more appropriate RPM group.
+  Replace unnecesary %__install macro by plain install,
+  and make all macros have the same style.
+
 -------------------------------------------------------------------
 Fri Feb  3 10:36:17 UTC 2017 - sebix+novell.com@sebix.at
 
diff --git a/hollywood.spec b/hollywood.spec
index a82be80..ab3e0f0 100644
--- a/hollywood.spec
+++ b/hollywood.spec
@@ -24,7 +24,7 @@ Version:        1.12
 Release:        0
 Summary:        Fill your console with Hollywood melodrama technobabble
 License:        Apache-2.0
-Group:          Applications/Other
+Group:          Amusements/Toys/Other
 Url:            http://launchpad.net/hollywood
 Source:         https://github.com/dustinkirkland/hollywood/archive/%commit.zip
 Patch0:         tmux-version-comp.patch
@@ -54,12 +54,12 @@ BuildArch:      noarch
 %package data
 Summary:        Data files for hollywood
 License:        CC0-1.0
-Group:          Applications/Other
+Group:          Amusements/Toys/Other
 
 %package -n wallstreet
 Summary:        Fill your console with Wall Street-like news and stats
 License:        Apache-2.0
-Group:          Applications/Other
+Group:          Amusements/Toys/Other
 Recommends:     byobu
 Recommends:     caca-utils
 Recommends:     newsbeuter
@@ -80,7 +80,7 @@ It is particularly suitable on any number of computer consoles in the
 background of any excellent schlock technothriller.
 
 %description data
-Data file needed for package hollywood.
+Data files needed for the "hollywood" package.
 
 %description -n wallstreet
 This utility will split your console into a multiple panes of news
@@ -93,28 +93,29 @@ and statistics, like any good computer screen on Wall Street.
 %build
 
 %install
-%{__install} -Dm 0755 -t %{buildroot}%{_bindir} bin/hollywood
-%{__install} -Dm 0755 -t %{buildroot}%{_libexecdir}/hollywood/ lib/hollywood/*
-%{__install} -Dm 0644 -t %{buildroot}%{_mandir}/man1/ share/man/man1/hollywood.1
-%{__install} -Dm 0644 -t %{buildroot}%{_datarootdir}/hollywood/ share/hollywood/*
+install -Dm 0755 -t %buildroot/%_bindir bin/hollywood
+install -Dm 0755 -t %buildroot/%_libexecdir/hollywood/ lib/hollywood/*
+install -Dm 0644 -t %buildroot/%_mandir/man1/ share/man/man1/hollywood.1
+install -Dm 0644 -t %buildroot/%_datarootdir/hollywood/ share/hollywood/*
 
-%{__install} -Dm 0755 bin/wallstreet %{buildroot}%{_bindir}
-%{__install} -Dm 0755 -t %{buildroot}%{_libexecdir}/wallstreet/ lib/wallstreet/*
-%{__install} -Dm 0644 -t %{buildroot}%{_datarootdir}/wallstreet share/wallstreet/*
+install -Dm 0755 bin/wallstreet %buildroot/%_bindir
+install -Dm 0755 -t %buildroot/%_libexecdir/wallstreet/ lib/wallstreet/*
+install -Dm 0644 -t %buildroot/%_datarootdir/wallstreet share/wallstreet/*
 
 %files
 %defattr(-,root,root)
 %_bindir/hollywood
 %_libexecdir/hollywood/
-%{_mandir}/man1/hollywood.1*
+%_mandir/man1/hollywood.1*
 
 %files data
-%{_datarootdir}/hollywood
+%defattr(-,root,root)
+%_datarootdir/hollywood
 
 %files -n wallstreet
 %defattr(-,root,root)
 %_bindir/wallstreet
 %_libexecdir/wallstreet/
-%{_datarootdir}/wallstreet
+%_datarootdir/wallstreet
 
 %changelog