diff --git a/ginac.spec b/ginac.spec
index 7a29091..f0fdb42 100644
--- a/ginac.spec
+++ b/ginac.spec
@@ -1,6 +1,6 @@
 Name:           ginac
 Version:        1.5.8
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        C++ library for symbolic calculations
 
 Group:          System Environment/Libraries
@@ -11,8 +11,8 @@ Patch0:         ginac-1.4.4-ginac_pc_in.patch
 Patch1:         ginac-1.5.1-lexer_cpp.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires(post): /sbin/install-info
-Requires(preun): /sbin/install-info
+Requires(post): info
+Requires(preun): info
 BuildRequires:  cln-devel >= 1.1 gcc-c++ readline-devel
 BuildRequires:  tetex-latex tetex-dvips doxygen transfig
 Obsoletes:      GiNaC < 1.3.2
@@ -24,11 +24,11 @@ open framework for symbolic computation within the C++ programming language.
 
 
 %package devel
-Summary: GiNaC development libraries and header files
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release} cln-devel pkgconfig
-Obsoletes: GiNaC-devel < 1.3.2
-Provides:  GiNaC-devel = %{version}-%{release}
+Summary:        GiNaC development libraries and header files
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release} cln-devel pkgconfig
+Obsoletes:      GiNaC-devel < 1.3.2
+Provides:       GiNaC-devel = %{version}-%{release}
 
 %description devel
 GiNaC (which stands for "GiNaC is Not a CAS (Computer Algebra System)") is an
@@ -39,11 +39,11 @@ use to develop GiNaC applications.
 
 
 %package utils
-Summary: GiNaC-related utilities
-Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
-Obsoletes: GiNaC-utils < 1.3.2
-Provides:  GiNaC-utils = %{version}-%{release}
+Summary:        GiNaC-related utilities
+Group:          System Environment/Libraries
+Requires:       %{name} = %{version}-%{release}
+Obsoletes:      GiNaC-utils < 1.3.2
+Provides:       GiNaC-utils = %{version}-%{release}
 
 %description utils
 GiNaC (which stands for "GiNaC is Not a CAS (Computer Algebra System)") is an
@@ -68,9 +68,13 @@ make %{?_smp_mflags}
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
 rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir
 
+%check
+export LD_LIBRARY_PATH=$( pwd )/ginac/.libs
+make check
+
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
@@ -106,6 +110,9 @@ fi
 %{_mandir}/man?/*
 
 %changelog
+* Sat Mar 05 2011 Christoph Wickert <cwickert@fedoraproject.org> - 1.5.8-3
+- Fix several spec file problems (#560197)
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.8-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild