diff --git a/tworld.spec b/tworld.spec
index d4154eb..4a5f8fa 100644
--- a/tworld.spec
+++ b/tworld.spec
@@ -1,13 +1,13 @@
-Name:	 tworld
+Name:    tworld
 %global fullname Tile World
 
 Version: 1.3.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Intellectually engaging puzzle game
 
 License: GPLv2+
 URL:     http://www.muppetlabs.com/~breadbox/software/tworld/
-Source0: http://www.muppetlabs.com/~breadbox/pub/software/tworld/tworld-%{version}-CCLPs.tar.gz	
+Source0: http://www.muppetlabs.com/~breadbox/pub/software/tworld/tworld-%{version}-CCLPs.tar.gz
 
 Source1: tworld-icon-16px.png
 Source2: tworld-icon-32px.png
@@ -15,8 +15,15 @@ Source3: tworld-icon-48px.png
 Source4: tworld.desktop
 Source5: tworld.appdata.xml
 
-BuildRequires: SDL SDL-devel 	
-BuildRequires: desktop-file-utils libappstream-glib
+BuildRequires: gcc SDL SDL-devel
+BuildRequires: desktop-file-utils
+
+# libappstream-glib is not available in EPEL6
+# This is only needed for appstream-util, so it can be safely omitted.
+%if !0%{?el6}
+BuildRequires: libappstream-glib
+%endif
+
 Requires: filesystem hicolor-icon-theme
 Requires: %{name}-cclp = %{version}-%{release}
 Requires: %{name}-data = %{version}-%{release}
@@ -68,17 +75,19 @@ make install prefix=%{buildroot}%{_prefix} bindir=%{buildroot}%{_bindir} mandir=
 install -m 755 -d %{buildroot}%{_datadir}/applications/
 desktop-file-install  --dir=%{buildroot}%{_datadir}/applications/  %{name}.desktop
 
+# Do not validate the file on EPEL6 as appstream-util is not available
+%if !0%{?el6}
 appstream-util validate-relax --nonet tworld.appdata.xml
+%endif
 install -m 755 -d %{buildroot}%{_datadir}/appdata/
 install -m 644 -p tworld.appdata.xml %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
 
-install -m 755 -d %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/
-install -m 755 -d %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/
-install -m 755 -d %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/
-install -m 644 -p tworld-icon-16px.png %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
-install -m 644 -p tworld-icon-32px.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
-install -m 644 -p tworld-icon-48px.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
-
+for SIZE in 16 32 48; do
+  install -m 755 -d %{buildroot}%{_datadir}/icons/hicolor/${SIZE}x${SIZE}/apps/
+  install -m 644 -p \
+    tworld-icon-${SIZE}px.png \
+    %{buildroot}%{_datadir}/icons/hicolor/${SIZE}x${SIZE}/apps/%{name}.png
+done
 
 cp -a CCLPs %{buildroot}%{_datadir}/%{name}/
 cat > %{buildroot}%{_datadir}/%{name}/sets/CCLP2-MS.dac <<EOF
@@ -132,6 +141,14 @@ fi
 
 
 %changelog
+* Sun Feb 18 2018 Artur Iwicki <fedora@svgames.pl> 1.3.2-4
+- Add missing BuildRequires: for gcc
+- Use a loop for installing icons instead of repeating the lines several times
+
+* Thu Jun 29 2017 Artur Iwicki <fedora@svgames.pl> 1.3.2-3
+- Added conditionals disabling stuff related to appstream-glib,
+  which is not available on EPEL6
+
 * Tue Jun 27 2017 Artur Iwicki <fedora@svgames.pl 1.3.2-3
 - Fix license tags in appdata file
 - Add dependency on hicolor-icon-theme