diff --git a/libhugetlbfs.changes b/libhugetlbfs.changes
index 0b1f6cc..895569f 100644
--- a/libhugetlbfs.changes
+++ b/libhugetlbfs.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Apr 20 10:40:04 UTC 2017 - jengelh@inai.de
+
+- Update summary and descriptions a bit
+- Move development manpages (*.3) to development subpackage
+- Avoid ||/&& in %install because it can leave $? at non-zero
+  (unlike if..fi), and %install is run with sh -x.
+
 -------------------------------------------------------------------
 Thu Mar  9 09:10:07 UTC 2017 - fschnizlein@suse.com
 
diff --git a/libhugetlbfs.spec b/libhugetlbfs.spec
index c6745d3..61e8f1c 100644
--- a/libhugetlbfs.spec
+++ b/libhugetlbfs.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package libhugetlbfs
 #
-# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,9 +20,9 @@
 Name:           libhugetlbfs
 Version:        2.20
 Release:        0
-Summary:        Hugetlbfs helper library
+Summary:        Helper library for the Huge Translation Lookaside Buffer Filesystem
 License:        LGPL-2.1+
-Group:          Development/Libraries/Other
+Group:          System/Libraries
 Url:            https://github.com/libhugetlbfs/libhugetlbfs
 Source0:        %{name}-%{version}.tar.xz
 Source1:        baselibs.conf
@@ -46,19 +46,20 @@ The libhugetlbfs package interacts with the Linux hugetlbfs to
 make large pages available to applications in a transparent manner.
 
 %package devel
-Summary:        Devel package for libhugetlb
-Group:          Development/Libraries/Other
+Summary:        Development files for libhugetlbfs
+Group:          Development/Libraries/C and C++
 Requires:       libhugetlbfs
 
 %description devel
-Devel package, header and static library, of libhugetlb
+Devel package, header and static library, of libhugetlbfs.
 
 %package tests
-Summary:        Tests for package libhugetlb
-Group:          Development/Libraries/Other
+Summary:        Tests for package libhugetlbfs
+Group:          Development/Tools/Other
 
 %description tests
-The testsuite for libhugetlb. Binaries can be found in %{_libdir}/libhugetlbfs/tests
+The testsuite for libhugetlbfs. Binaries can be found in
+%{_libdir}/libhugetlbfs/tests.
 
 %prep
 %setup -q
@@ -80,14 +81,16 @@ make %{my_make_flags} install-tests
 mkdir -p %{buildroot}%{_prefix}/include
 cp -avL hugetlbfs.h %{buildroot}%{_prefix}/include
 chmod 644 %{buildroot}%{_libdir}/*.a
-[ ! -f %{buildroot}%{_libdir}/libhugetlbfs/tests/obj64/dummy.ldscript ] || chmod -f a-x %{buildroot}%{_libdir}/libhugetlbfs/tests/obj64/dummy.ldscript
+if [ -f %{buildroot}%{_libdir}/libhugetlbfs/tests/obj64/dummy.ldscript ]; then
+	chmod -f a-x %{buildroot}%{_libdir}/libhugetlbfs/tests/obj64/dummy.ldscript
+fi
 
 %files
 %defattr(-, root, root)
 %doc LGPL-2.1 HOWTO README NEWS
 %{_datadir}/libhugetlbfs
 %{_bindir}/*
-%{_mandir}/man*/*.gz
+%{_mandir}/man[178]/*%{?ext_man}
 %{_libdir}/libhugetlbfs_privutils.so
 %{_libdir}/libhugetlbfs.so
 
@@ -95,10 +98,10 @@ chmod 644 %{buildroot}%{_libdir}/*.a
 %defattr(-, root, root)
 %{_includedir}/hugetlbfs.h
 %{_libdir}/libhugetlbfs.a
+%{_mandir}/man3/*%{?ext_man}
 
 %files tests
 %defattr(-,root,root)
-%dir %{_libdir}/libhugetlbfs
-%{_libdir}/libhugetlbfs/*
+%{_libdir}/libhugetlbfs/
 
 %changelog