diff --git a/mbedtls.changes b/mbedtls.changes
index 8601cc7..ef481a2 100644
--- a/mbedtls.changes
+++ b/mbedtls.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Mar  8 09:32:12 UTC 2018 - mpluskal@suse.com
+
+- Use more cmake macros
+- Update spec file using spec-cleaner
+
 -------------------------------------------------------------------
 Tue Feb 13 15:55:27 UTC 2018 - kbabioch@suse.com
 
diff --git a/mbedtls.spec b/mbedtls.spec
index 462cc35..8c128b4 100644
--- a/mbedtls.spec
+++ b/mbedtls.spec
@@ -25,7 +25,7 @@ Release:        0
 Summary:        Libraries for crypto and SSL/TLS protocols
 License:        Apache-2.0
 Group:          Development/Libraries/C and C++
-Url:            https://tls.mbed.org
+URL:            https://tls.mbed.org
 Source:         https://tls.mbed.org/download/%{name}-%{version}-apache.tgz
 Source99:       baselibs.conf
 BuildRequires:  cmake
@@ -101,14 +101,14 @@ sed -i 's|//\(#define MBEDTLS_THREADING_PTHREAD\)|\1|' include/mbedtls/config.h
   -DUSE_SHARED_MBEDTLS_LIBRARY=ON \
   -DUSE_STATIC_MBEDTLS_LIBRARY=OFF \
   -DENABLE_PROGRAMS=OFF
-make VERBOSE=1 %{?_smp_mflags}
+%make_jobs
 
 %install
 %cmake_install
 
 %check
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:%{_builddir}/%{name}-%{version}/build/library
-make -C build test %{?_smp_mflags}
+%ctest
 
 %post -n %{lib_tls}      -p /sbin/ldconfig
 %post -n %{lib_crypto}   -p /sbin/ldconfig
@@ -118,7 +118,8 @@ make -C build test %{?_smp_mflags}
 %postun -n %{lib_x509}   -p /sbin/ldconfig
 
 %files devel
-%doc ChangeLog README.md LICENSE
+%license LICENSE
+%doc ChangeLog README.md
 %dir %{_includedir}/mbedtls
 %{_includedir}/mbedtls/*.h
 %{_libdir}/libmbedtls.so
@@ -126,15 +127,15 @@ make -C build test %{?_smp_mflags}
 %{_libdir}/libmbedx509.so
 
 %files -n %{lib_tls}
-%doc LICENSE
+%license LICENSE
 %{_libdir}/libmbedtls.so.*
 
 %files -n %{lib_crypto}
-%doc LICENSE
+%license LICENSE
 %{_libdir}/libmbedcrypto.so.*
 
 %files -n %{lib_x509}
-%doc LICENSE
+%license LICENSE
 %{_libdir}/libmbedx509.so.*
 
 %changelog