diff --git a/ding-libs.spec b/ding-libs.spec
index a2e1692..55aad78 100644
--- a/ding-libs.spec
+++ b/ding-libs.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package ding-libs
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -93,7 +93,7 @@ A small library that provides a buffer object.
 Summary:        Filesystem Path Utilities
 License:        LGPL-3.0+
 Group:          System/Libraries
-Version:        %{path_utils_version}
+Version:        %path_utils_version
 Release:        0
 
 %description -n libpath_utils1
@@ -103,8 +103,8 @@ Utility functions to manipulate filesystem pathnames
 Summary:        Development files for libpath_utils
 License:        LGPL-3.0+
 Group:          Development/Libraries/C and C++
-Requires:       libpath_utils1 = %{path_utils_version}
-Version:        %{path_utils_version}
+Requires:       libpath_utils1 = %path_utils_version
+Version:        %path_utils_version
 Release:        0
 
 %description -n libpath_utils-devel
@@ -116,14 +116,14 @@ Utility functions to manipulate filesystem pathnames
 
 %files -n libpath_utils1
 %defattr(-,root,root,-)
-%{_libdir}/libpath_utils.so.1*
+%_libdir/libpath_utils.so.1*
 
 %files -n libpath_utils-devel
 %defattr(-,root,root,-)
 %doc COPYING COPYING.LESSER
-%{_includedir}/path_utils.h
-%{_libdir}/libpath_utils.so
-%{_libdir}/pkgconfig/path_utils.pc
+%_includedir/path_utils.h
+%_libdir/libpath_utils.so
+%_libdir/pkgconfig/path_utils.pc
 %doc path_utils/README.path_utils
 %doc path_utils/doc/html/
 
@@ -135,7 +135,7 @@ Utility functions to manipulate filesystem pathnames
 Summary:        Dynamic hash table
 License:        LGPL-3.0+
 Group:          System/Libraries
-Version:        %{dhash_version}
+Version:        %dhash_version
 Release:        0
 
 %description -n libdhash1
@@ -146,8 +146,8 @@ time properties
 Summary:        Development files for libdhash
 License:        LGPL-3.0+
 Group:          Development/Libraries/C and C++
-Requires:       libdhash1 = %{dhash_version}
-Version:        %{dhash_version}
+Requires:       libdhash1 = %dhash_version
+Version:        %dhash_version
 Release:        0
 
 %description -n libdhash-devel
@@ -160,14 +160,14 @@ time properties
 
 %files -n libdhash1
 %defattr(-,root,root,-)
-%{_libdir}/libdhash.so.1*
+%_libdir/libdhash.so.1*
 
 %files -n libdhash-devel
 %defattr(-,root,root,-)
 %doc COPYING COPYING.LESSER
-%{_includedir}/dhash.h
-%{_libdir}/libdhash.so
-%{_libdir}/pkgconfig/dhash.pc
+%_includedir/dhash.h
+%_libdir/libdhash.so
+%_libdir/pkgconfig/dhash.pc
 %doc dhash/README.dhash
 %doc dhash/examples/
 
@@ -179,7 +179,7 @@ time properties
 Summary:        Collection data-type for C
 License:        LGPL-3.0+
 Group:          System/Libraries
-Version:        %{collection_version}
+Version:        %collection_version
 Release:        0
 
 %description -n libcollection2
@@ -190,8 +190,8 @@ and serialization
 Summary:        Development files for libcollection
 License:        LGPL-3.0+
 Group:          Development/Libraries/C and C++
-Requires:       libcollection2 = %{collection_version}
-Version:        %{collection_version}
+Requires:       libcollection2 = %collection_version
+Version:        %collection_version
 Release:        0
 
 %description -n libcollection-devel
@@ -204,17 +204,17 @@ and serialization
 
 %files -n libcollection2
 %defattr(-,root,root,-)
-%{_libdir}/libcollection.so.2*
+%_libdir/libcollection.so.2*
 
 %files -n libcollection-devel
 %defattr(-,root,root,-)
 %doc COPYING COPYING.LESSER
-%{_includedir}/collection.h
-%{_includedir}/collection_tools.h
-%{_includedir}/collection_queue.h
-%{_includedir}/collection_stack.h
-%{_libdir}/libcollection.so
-%{_libdir}/pkgconfig/collection.pc
+%_includedir/collection.h
+%_includedir/collection_tools.h
+%_includedir/collection_queue.h
+%_includedir/collection_stack.h
+%_libdir/libcollection.so
+%_libdir/pkgconfig/collection.pc
 %doc collection/doc/html/
 
 ##############################################################################
@@ -225,7 +225,7 @@ and serialization
 Summary:        A refcounted array for C
 License:        GPL-3.0+
 Group:          System/Libraries
-Version:        %{ref_array_version}
+Version:        %ref_array_version
 Release:        0
 
 %description -n libref_array1
@@ -235,8 +235,8 @@ A dynamically-growing, reference-counted array
 Summary:        Development files for libref_array
 License:        GPL-3.0+
 Group:          Development/Libraries/C and C++
-Requires:       libref_array1 = %{ref_array_version}
-Version:        %{ref_array_version}
+Requires:       libref_array1 = %ref_array_version
+Version:        %ref_array_version
 Release:        0
 
 %description -n libref_array-devel
@@ -248,14 +248,14 @@ A dynamically-growing, reference-counted array
 
 %files -n libref_array1
 %defattr(-,root,root,-)
-%{_libdir}/libref_array.so.1*
+%_libdir/libref_array.so.1*
 
 %files -n libref_array-devel
 %defattr(-,root,root,-)
 %doc COPYING COPYING.LESSER
-%{_includedir}/ref_array.h
-%{_libdir}/libref_array.so
-%{_libdir}/pkgconfig/ref_array.pc
+%_includedir/ref_array.h
+%_libdir/libref_array.so
+%_libdir/pkgconfig/ref_array.pc
 %doc refarray/README.ref_array
 %doc refarray/doc/html/
 
@@ -267,7 +267,7 @@ A dynamically-growing, reference-counted array
 Summary:        INI file parser for C
 License:        LGPL-3.0+
 Group:          System/Libraries
-Version:        %{ini_config_version}
+Version:        %ini_config_version
 Release:        0
 
 %description -n libini_config3
@@ -279,9 +279,9 @@ Summary:        Development files for libini_config
 License:        LGPL-3.0+
 Group:          Development/Libraries/C and C++
 Requires:       libbasicobjects-devel
-Requires:       libini_config3 = %{ini_config_version}
+Requires:       libini_config3 = %ini_config_version
 Requires:       libref_array-devel
-Version:        %{ini_config_version}
+Version:        %ini_config_version
 Release:        0
 
 %description -n libini_config-devel
@@ -294,14 +294,14 @@ structure
 
 %files -n libini_config3
 %defattr(-,root,root,-)
-%{_libdir}/libini_config.so.3*
+%_libdir/libini_config.so.3*
 
 %files -n libini_config-devel
 %defattr(-,root,root,-)
 %doc COPYING COPYING.LESSER
-%{_includedir}/ini_*.h
-%{_libdir}/libini_config.so
-%{_libdir}/pkgconfig/ini_config.pc
+%_includedir/ini_*.h
+%_libdir/libini_config.so
+%_libdir/pkgconfig/ini_config.pc
 %doc ini/doc/html/
 
 ##############################################################################
@@ -325,18 +325,16 @@ make %{?_smp_mflags} all docs LDFLAGS="-Wl,--version-script=$PWD/ding.map"
 make %{?_smp_mflags} check
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
-
-# Remove .la files created by libtool
-rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
+make install DESTDIR="%buildroot"
+rm -f "%buildroot/%_libdir"/*.la
 
 # Remove the example files from the output directory
 # We will copy them directly from the source directory
 # for packaging
 rm -f \
-    $RPM_BUILD_ROOT/usr/share/doc/ding-libs/README.* \
-    $RPM_BUILD_ROOT/usr/share/doc/ding-libs/examples/dhash_example.c \
-    $RPM_BUILD_ROOT/usr/share/doc/ding-libs/examples/dhash_test.c
+    "%buildroot/%_datadir/doc/ding-libs"/README.* \
+    "%buildroot/%_datadir/doc/ding-libs/examples/dhash_example.c" \
+    "%buildroot/%_datadir/doc/ding-libs/examples/dhash_test.c"
 
 # Remove document install script. RPM is handling this
 rm -f */doc/html/installdox