diff --git a/cmake.changes b/cmake.changes
index 7f01eec..f743d0a 100644
--- a/cmake.changes
+++ b/cmake.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Mon Aug 18 23:09:38 UTC 2014 - hrvoje.senjan@gmail.com
+
+- Import some cmake handing from kf5- and kde4- filesystem to macros:
+   * Simplify debug build handling in macros. Whether debug is on
+     or off is known to optflags
+   * Don't build in release mode, that cramps optimization flags;
+     instead pass wanted flags directly
+   * Pass -Wl,--as-needed -Wl,--no-undefined to linker, to avoid
+     unneeded libs, and to disallow undefined symbols
+   * Add a %make_jobs macro with verbose argument 
+   * Simplify %cmake_install invocation
+
 -------------------------------------------------------------------
 Mon Aug 18 08:20:28 UTC 2014 - tchvatal@suse.com
 
diff --git a/cmake.macros b/cmake.macros
index c79e2a8..85d1665 100644
--- a/cmake.macros
+++ b/cmake.macros
@@ -3,18 +3,12 @@
 #
 %__cmake %{_bindir}/cmake
 %__ctest %{_bindir}/ctest
-%_cmake_debug %{?with_debug:debug}%{?!with_debug:release}
 
 %cmake \
-    CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
-    CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
-    FFLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FFLAGS ; \
     find . -name CMakeLists.txt \\\
         -exec sed -i -re '/^[[:blank:]]*[sS][eE][tT][[:blank:]]*\\\([[:blank:]]*(CMAKE_BUILD_TYPE|CMAKE_COLOR_MAKEFILE|CMAKE_INSTALL_PREFIX|CMAKE_VERBOSE_MAKEFILE).*\\\)/{s/^/#IGNORE /}' {} + \
     mkdir -p build \
     cd build \
-    %define enable_debug 1 \
-    %{?_enable_debug: %{expand: %%global enable_debug 1}} \
     %__cmake .. \\\
         -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \\\
         -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \\\
@@ -22,7 +16,13 @@
         -DLIB_INSTALL_DIR:PATH=%{_libdir} \\\
         -DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \\\
         -DSHARE_INSTALL_PREFIX:PATH=%{_datadir} \\\
-        -DCMAKE_BUILD_TYPE=%{_cmake_debug} \\\
+        -DCMAKE_BUILD_TYPE=None \\\
+        -DCMAKE_C_FLAGS="${CFLAGS:-%optflags} -DNDEBUG" \\\
+        -DCMAKE_CXX_FLAGS="${CXXFLAGS:-%optflags} -DNDEBUG" \\\
+        -DCMAKE_Fortran_FLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}} -DNDEBUG" \\\
+        -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-undefined" \\\
+        -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-undefined" \\\
+        -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-undefined" \\\
 %if "%{?_lib}" == "lib64" \
         -DLIB_SUFFIX=64 \\\
 %endif \
@@ -35,10 +35,11 @@
         -DCMAKE_MODULES_INSTALL_DIR=%{_datadir}/cmake/Modules \\\
         -DCMAKE_USER_MAKE_RULES_OVERRIDE="%{_datadir}/cmake/Modules/opensuse_rules.cmake"
 
+%make_jobs \
+  %{__make} %{?_smp_mflags} VERBOSE=1
+
 %cmake_install \
-    cd build \
-    make DESTDIR=%{buildroot} install/fast \
-    cd ..
+    make VERBOSE=1 DESTDIR=%{buildroot} install/fast -C build \
 
 %ctest \
     cd build \