diff --git a/espeak-ng.spec b/espeak-ng.spec
index 942a386..67518ec 100644
--- a/espeak-ng.spec
+++ b/espeak-ng.spec
@@ -38,12 +38,11 @@ rm -rf src/include/compat/endian.h src/compat/getopt.c android/
 ./autogen.sh
 %configure
 %make_build src/espeak-ng src/speak-ng
-%make_build
+make
 LC_ALL=C.UTF-8 make docs
 %install
 %make_install
-install -p %{buildroot}%{_datadir}/vim/addons %{buildroot}%{_datadir}/vim/vimfiles
-%delete_la_and_a
+mv %{buildroot}%{_datadir}/vim/addons %{buildroot}%{_datadir}/vim/vimfiles
 %check
 ESPEAK_DATA_PATH=`pwd` LD_LIBRARY_PATH=src:${LD_LIBRARY_PATH} src/espeak-ng ...
 %post
@@ -58,16 +57,16 @@ ESPEAK_DATA_PATH=`pwd` LD_LIBRARY_PATH=src:${LD_LIBRARY_PATH} src/espeak-ng ...
 %{_datadir}/espeak-ng-data
 %{_datadir}/vim/vimfiles/ftdetect/espeakfiletype.vim
 %{_datadir}/vim/vimfiles/syntax/{espeaklist.vim,espeakrules.vim}
+%exclude %{_bindir}/{speak,espeak}
+%exclude %{_datadir}/vim/registry
 
 %files devel
 %{_libdir}/pkgconfig/espeak-ng.pc
 %{_libdir}/libespeak-ng.so
 %{_includedir}/espeak-ng
 %exclude %{_libdir}/libespeak-ng-test.so*
-%exclude %{_bindir}/{speak,espeak}
+%exclude %{_libdir}/*.{a,la}
 %exclude %{_includedir}/espeak
-%exclude %{_datadir}/vim/registry
-%exclude %{_datadir}/vim/addons
 
 %files help
 %doc docs/*.html