diff --git a/yapet.spec b/yapet.spec
index 87baea8..9eb32aa 100644
--- a/yapet.spec
+++ b/yapet.spec
@@ -3,7 +3,7 @@
 Name:           yapet
 Version:        1.0
 Release:        5%{?pre}%{?dist}
-Summary:        Curses based password encryption tool
+Summary:        Yet Another Password Encryption Tool
 License:        GPLv3+ with exceptions
 URL:            http://www.guengel.ch/myapps/%{name}/
 Source0:        http://www.guengel.ch/myapps/%{name}/downloads/%{name}-%{version}%{?pre}.tar.bz2
@@ -27,28 +27,34 @@ do
 done
 
 %build
-%configure --enable-terminal-title \
-           --enable-csv2yapet \
-           --enable-pwgen \
-           --disable-build-doc \
-           --disable-source-doc \
-           --disable-install-doci \
+%configure --disable-install-doc   \
+           --disable-source-doc    \
+           --disable-install-doci  \
 		   --disable-silent-rules
 
-%make_build CXXFLAGS+="%{optflags}" CFLAGS+="%{optflags}"
+%make_build
 
 %install
 %make_install
-# Console running is Ok.
+# Console running is OK.
 rm -frv %{buildroot}%{_datadir}/applications/
 
+# %%doc instead.
+rm -frv %{buildroot}%{_docdir}
+
 %find_lang %{name}
 %find_lang libyacurs
 
+%check
+# RNG tests need /dev/urandom OR /dev/random!
+# Failed at messagebox1. Digging.
+#make check
+
 %files -f %{name}.lang -f libyacurs.lang
-%doc AUTHORS COPYING DESIGN LICENSE NEWS README THANKS TODO
-%{_bindir}/*
-%{_mandir}/man*/*%{name}*
+%doc AUTHORS DESIGN NEWS README THANKS TODO
+%license COPYING LICENSE
+%{_bindir}/*yapet*
+%{_mandir}/man*/*yapet*
 
 %changelog
 * Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-5