diff --git a/ibmtss.changes b/ibmtss.changes
index f6480f1..24145a8 100644
--- a/ibmtss.changes
+++ b/ibmtss.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Feb  8 09:33:13 UTC 2017 - jengelh@inai.de
+
+- Wrap description and spell out TSS.
+- Move package description up before any build recipes,
+  this is the more usual layout.
+- Drop unusable "return" command; %build already executes with
+  sh -e.
+
 -------------------------------------------------------------------
 Fri Jan 27 11:44:04 UTC 2017 - msuchanek@suse.com
 
diff --git a/ibmtss.spec b/ibmtss.spec
index 7a76add..f4e1057 100644
--- a/ibmtss.spec
+++ b/ibmtss.spec
@@ -42,9 +42,28 @@ Recommends:     %{name}-base = %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
-This is a user space TSS for TPM 2.0. It implements the functionality equivalent to the TCG TSS working group's planned ESAPI, SAPI, and TCTI API's.
+This is a user space TCG Software Stack (TSS) for TPM 2.0. It
+implements the functionality equivalent to the TCG TSS working
+group's planned ESAPI, SAPI, and TCTI APIs.
 
-It comes with over 100 "TPM tools" that can be used for scripted apps, rapid prototyping, education, and debugging.
+It comes with over 100 "TPM tools" that can be used for scripted
+apps, rapid prototyping, education, and debugging.
+
+%package base
+Summary:        IBM's TPM 2.0 TSS shared files
+Group:          Productivity/Security
+BuildArch:      noarch
+
+%description base
+Includes IBM's TPM 2.0 TSS certificates and policy files.
+
+%package devel
+Summary:        IBM's TPM 2.0 TSS headers
+Group:          Development/Libraries/C and C++
+Requires:       %{suite} = %{version}
+
+%description devel
+Includes IBM's TPM 2.0 TSS certificates and policy files.
 
 %prep
 %setup -c -q
@@ -54,9 +73,10 @@ It comes with over 100 "TPM tools" that can be used for scripted apps, rapid pro
 cd utils
 [ -n "%{test}" ] && { %{_libexecdir}/%{suite}/tpm_server & tpm_server="$!" ; }
 CCFLAGS="%{optflags}" make LNAFLAGS="-Wl,-rpath,%{_libexecdir}/%{suite}" %{?_smp_mflags}
+testfailed=0
 [ -n "%{test}" ] && { TPM_INTERFACE_TYPE=socsim LD_LIBRARY_PATH=. ./reg.sh || testfailed=$? ; }
 [ -n "%{test}" ] && kill "$tpm_server" || :
-[ -n "$testfailed" ] && return $testfailed
+[ "$testfailed" -eq 0 ]
 
 %install
 cd utils
@@ -71,10 +91,6 @@ install -p -D -m 644 %{SOURCE1}.1 %{buildroot}/%{_mandir}/man1/%{suite}.1
 sed -i -e s,%UTILDIR%,%{_libexecdir}/%{suite},g -e s,%DATADIR%,%{_datadir}/%{suite},g -e s,%DOCDIR%,%{_docdir}/%{name},g \
       %{buildroot}/%{_bindir}/%{suite} %{buildroot}/%{_mandir}/man1/%{suite}.1
 
-%post
-
-%postun
-
 %files
 %defattr(-,root,root)
 %doc ibmtss.doc  LICENSE
@@ -82,25 +98,11 @@ sed -i -e s,%UTILDIR%,%{_libexecdir}/%{suite},g -e s,%DATADIR%,%{_datadir}/%{sui
 %{_bindir}/%{suite}
 %{_mandir}/man1/%{suite}.1*
 
-%package base
-Summary:        IBM's TPM 2.0 TSS shared files
-Group:          Productivity/Security
-BuildArch:      noarch
-
-%description base
-Includes IBM's TPM 2.0 TSS certificates and policy files.
 %files base
 %defattr(-,root,root)
 %doc LICENSE
 %{_datadir}/%{suite}
 
-%package devel
-Summary:        IBM's TPM 2.0 TSS headers
-Group:          Development/Libraries
-Requires:       %{suite} = %{version}
-
-%description devel
-Includes IBM's TPM 2.0 TSS certificates and policy files.
 %files devel
 %defattr(-,root,root)
 %doc LICENSE