diff --git a/rpm/ssu.changes b/rpm/ssu.changes
index c27dd6d..b29886a 100644
--- a/rpm/ssu.changes
+++ b/rpm/ssu.changes
@@ -1,3 +1,7 @@
+* Thu Apr 04 2013 Bernd Wachter <bernd.wachter@jollamobile.com> - 0.31
+- Refactorize project files
+- Add Sandbox
+
 * Wed Apr 03 2013 Bernd Wachter <bernd.wachter@jollamobile.com> - 0.30.1
 - Use oneshot to add default user to ssu group
 
diff --git a/rpm/ssu.spec b/rpm/ssu.spec
index 2e83386..e3c27c5 100644
--- a/rpm/ssu.spec
+++ b/rpm/ssu.spec
@@ -1,5 +1,5 @@
 Name: ssu
-Version: 0.30.1
+Version: 0.31
 Release: 1
 Summary: SSU enabler for RND
 Group: System/Base
@@ -128,13 +128,14 @@ Group: Documentation
 
 
 %build
-qmake DEFINES+='TARGET_ARCH=\\\"\"%{_target_cpu}\"\\\"' -recursive
+mkdir -p build && cd build
+qmake DEFINES+='TARGET_ARCH=\\\"\"%{_target_cpu}\"\\\"' -recursive ..
 make %{?_smp_mflags}
-doxygen doc/Doxyfile
+doxygen ../doc/Doxyfile
 
 
 %install
-make INSTALL_ROOT=%{buildroot} install
+cd build && make INSTALL_ROOT=%{buildroot} install
 mkdir -p %{buildroot}/%{_sysconfdir}/zypp/credentials.d
 ln -s %{_bindir}/ssu %{buildroot}/%{_bindir}/rndssu
 mkdir -p %{buildroot}/%{_docdir}/%{name}