diff --git a/Fix-compile-on-32bit.patch b/Fix-compile-on-32bit.patch
new file mode 100644
index 0000000..859c82e
--- /dev/null
+++ b/Fix-compile-on-32bit.patch
@@ -0,0 +1,29 @@
+From 76fd2e84ba133e96d2cfdf90cb715e66e923eb8f Mon Sep 17 00:00:00 2001
+From: Milian Wolff <mail@milianw.de>
+Date: Thu, 17 May 2018 13:31:25 +0200
+Subject: Fix compile on 32bit
+
+BUG: 394330
+---
+ src/util/linewriter.h | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/util/linewriter.h b/src/util/linewriter.h
+index 73a7930..e895e87 100644
+--- a/src/util/linewriter.h
++++ b/src/util/linewriter.h
+@@ -158,6 +158,11 @@ public:
+         return __builtin_clzl(V);
+     }
+ 
++    inline static unsigned clz(long long unsigned V)
++    {
++        return __builtin_clzll(V);
++    }
++
+     template <typename V>
+     static char* writeHexNumber(char* buffer, V value)
+     {
+-- 
+cgit v0.11.2
+
diff --git a/heaptrack.changes b/heaptrack.changes
index 2c4ccd5..1c88684 100644
--- a/heaptrack.changes
+++ b/heaptrack.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Wed May 23 15:06:59 UTC 2018 - wbauer@tmo.at
+
+- Add Fix-compile-on-32bit.patch to make it build on 32bit
+  (kde#394330)
+- Don't install office-chart-area icon from breeze to hicolor
+  anymore, heaptrack comes with its own application icon now
+- Mark license files as %license instead of %doc
+- Install README.md as well, it contains instructions on how to use
+  it
+
 -------------------------------------------------------------------
 Wed May 23 13:40:54 UTC 2018 - fabian@ritter-vogt.de
 
diff --git a/heaptrack.spec b/heaptrack.spec
index 9caddbc..5eff018 100644
--- a/heaptrack.spec
+++ b/heaptrack.spec
@@ -27,8 +27,8 @@ License:        LGPL-2.1+
 Group:          Development/Tools/Other
 Url:            https://userbase.kde.org/Heaptrack
 Source0:        https://download.kde.org/stable/heaptrack/%{version}/%{name}-%{version}.tar.xz
-# Needs office-chart-area icon
-BuildRequires:  breeze5-icons
+# PATCH-FIX-UPSTREAM
+Patch:          Fix-compile-on-32bit.patch
 BuildRequires:  extra-cmake-modules
 BuildRequires:  kf5-filesystem
 BuildRequires:  cmake(KChart) >= 2.6.0
@@ -64,6 +64,7 @@ A memory profiler for Linux, tracking heap allocations.
 
 %prep
 %setup -q
+%patch -p1
 # Disable building tests, they're not used and post-build-checks trips over it
 sed -i"" '/add_subdirectory(tests)/d' CMakeLists.txt
 
@@ -76,9 +77,6 @@ sed -i"" '/add_subdirectory(tests)/d' CMakeLists.txt
   %if %{with lang}
     %find_lang %{name} --all-name
   %endif
-  # Install icon from breeze
-  mkdir -p %{buildroot}%{_kf5_iconsdir}/hicolor/scalable/apps/
-  cp %{_kf5_iconsdir}/breeze/actions/24/office-chart-area.svg %{buildroot}%{_kf5_iconsdir}/hicolor/scalable/apps/
   # Fixup desktop file
   %suse_update_desktop_file org.kde.heaptrack Development Profiling
 
@@ -101,19 +99,20 @@ A Qt5/KF5 based GUI for Heaptrack.
 
 %files
 %defattr(-,root,root)
-%doc COPYING*
+%license COPYING*
+%doc README.md
 %{_kf5_bindir}/heaptrack
 %{_kf5_bindir}/heaptrack_print
 %{_libexecdir}/heaptrack
 
 %files devel
 %defattr(-,root,root)
-%doc COPYING*
+%license COPYING*
 %{_includedir}/heaptrack_api.h
 
 %files gui
 %defattr(-,root,root)
-%doc COPYING*
+%license COPYING*
 %{_kf5_bindir}/heaptrack_gui
 %{_datadir}/applications/org.kde.heaptrack.desktop
 %{_kf5_appstreamdir}/org.kde.heaptrack.appdata.xml
@@ -123,7 +122,7 @@ A Qt5/KF5 based GUI for Heaptrack.
 
 %if %{with lang}
 %files lang -f %{name}.lang
-%doc COPYING*
+%license COPYING*
 %endif
 
 %changelog