diff --git a/twind.changes b/twind.changes
index 304e69f..97bfb40 100644
--- a/twind.changes
+++ b/twind.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Dec  8 22:08:24 UTC 2014 - nemysis@gmx.ch
+
+- Use CFLAGS="%{optflags}" to fix
+  'File is compiled without RPM_OPT_FLAGS'
+- Install icon in %{_datadir}/icons/hicolor/-x-/apps/
+  instead of %{_datadir}/pixmaps/
+
 -------------------------------------------------------------------
 Fri Nov 14 20:30:22 UTC 2014 - nemysis@gmx.ch
 
diff --git a/twind.spec b/twind.spec
index afd2494..6c2c14e 100644
--- a/twind.spec
+++ b/twind.spec
@@ -34,6 +34,7 @@ BuildRequires:  update-desktop-files
 BuildRequires:  pkgconfig(SDL_image)
 BuildRequires:  pkgconfig(SDL_mixer)
 BuildRequires:  pkgconfig(sdl)
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 The object of the game is to remove all of the blocks from the screen
@@ -53,7 +54,7 @@ sed -i -e 's|chown |true |g' \
        Makefile
 
 %build
-make %{?_smp_mflags}
+make %{?_smp_mflags} CFLAGS="%{optflags}"
 
 %install
 mkdir -p %{buildroot}%{_bindir}
@@ -62,7 +63,7 @@ make install BIN_PREFIX=%{buildroot}%{_bindir}/ \
              HIGH_SCORE_PREFIX=%{buildroot}%{_localstatedir}/games/twindistress/
 
 # install icon
-install -Dm 0644 graphics/%{name}.png %{buildroot}%{_datadir}/pixmaps/%{name}.png
+install -Dm 0644 graphics/%{name}.png %{buildroot}/%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
 
 # install Desktop file
 install -Dm 0644 %{S:1} %{buildroot}%{_datadir}/applications/%{name}.desktop
@@ -77,7 +78,7 @@ install -Dm 0644 %{S:1} %{buildroot}%{_datadir}/applications/%{name}.desktop
 %doc AUTHORS COPYING CREDITS ChangeLog NEWS README
 %attr(0755,root,games) %{_bindir}/%{name}
 %{_datadir}/applications/%{name}.desktop
-%{_datadir}/pixmaps/%{name}.png
+%{_datadir}/icons/hicolor/
 %{_datadir}/%{name}
 %attr(0775,root,games) %{_localstatedir}/games/twindistress
 # Correct Permissions