diff --git a/ax_init_standard_project.m4 b/ax_init_standard_project.m4
index 26f3c7e..76ee9f7 100644
--- a/ax_init_standard_project.m4
+++ b/ax_init_standard_project.m4
@@ -164,7 +164,6 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
   test -f makefile.in && cat >> makefile.in <<EOF
 #### Begin: Appended by $0
 EXTRA_DIST = bootstrap.sh
-doc_DATA = AUTHORS NEWS README COPYING INSTALL ChangeLog
 clean-standard-project-targets:
 	-rm -rf \${PACKAGE_NAME}-\${PACKAGE_VERSION}
 	-rm \${PACKAGE_TARNAME}-\${PACKAGE_VERSION}.tar.gz
diff --git a/bootstrap.sh b/bootstrap.sh
index f013e97..387b093 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -817,6 +817,8 @@ done
 to makefile.am<<EOF
 ${HEADER}SUBDIRS =${SUBDIRS}
 
+doc_DATA = AUTHORS NEWS README COPYING INSTALL ChangeLog
+
 MAINTAINERCLEANFILES = makefile.in
 EOF
 to --condition AX_USE_LIBTOOL src/${PACKAGE_NAME}.pc.in <<EOF
diff --git a/makefile.am b/makefile.am
index 9fe8e1d..601a664 100644
--- a/makefile.am
+++ b/makefile.am
@@ -1,6 +1,6 @@
 ## @id $Id$
 #
-# This file has been added by bootstrap.sh on Tue, 28 July 2015 11:31:59 +0200
+# This file has been added by bootstrap.sh on Tue, 28 July 2015 16:14:38 +0200
 # Feel free to change it or even remove and rebuild it, up to your needs
 #
 ##       1         2         3         4         5         6         7         8
@@ -8,4 +8,6 @@
 
 SUBDIRS = src test doc examples
 
+doc_DATA = AUTHORS NEWS README COPYING INSTALL ChangeLog
+
 MAINTAINERCLEANFILES = makefile.in
diff --git a/mrw-c++.spec.in b/mrw-c++.spec.in
index c196391..402363a 100644
--- a/mrw-c++.spec.in
+++ b/mrw-c++.spec.in
@@ -34,8 +34,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-/usr/bin/*
-/usr/%_lib/@PACKAGE_NAME@.so.*
+/usr/%_lib/lib@PACKAGE_NAME@.so.*
 %doc
 /usr/share/doc/packages/@PACKAGE_NAME@/AUTHORS
 /usr/share/doc/packages/@PACKAGE_NAME@/COPYING
@@ -56,10 +55,10 @@ This Package contains all files required for developement.
 
 %files devel
 %defattr(-,root,root,-)
-/usr/%_lib/@PACKAGE_NAME@.so
-/usr/%_lib/@PACKAGE_NAME@.a
+/usr/%_lib/lib@PACKAGE_NAME@.so
+/usr/%_lib/lib@PACKAGE_NAME@.a
 /usr/%_lib/pkgconfig
-/usr/%_lib/@PACKAGE_NAME@.la
+/usr/%_lib/lib@PACKAGE_NAME@.la
 /usr/include/
 /usr/share/pkgconfig
 %doc