diff --git a/.gitignore b/.gitignore
index 1deec5b..a7aff32 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1 @@
-rply-1.01.tar.gz
-/rply-1.1.1.tar.gz
-/rply-1.1.2.tar.gz
-/rply-1.1.4.tar.gz
+/rply-*.tar.gz
diff --git a/RPLYConfig.cmake.in b/RPLYConfig.cmake.in
index aad66da..5c4ec64 100644
--- a/RPLYConfig.cmake.in
+++ b/RPLYConfig.cmake.in
@@ -1,6 +1,6 @@
 # The RPLY library directory.
-SET(RPLY_LIBRARY_DIR "@LIB_INSTALL_DIR@")
-SET(RPLY_INCLUDE_DIR "@INCLUDE_INSTALL_DIR@")
+SET(RPLY_LIBRARY_DIR "@CMAKE_INSTALL_LIBDIR@")
+SET(RPLY_INCLUDE_DIR "@CMAKE_INSTALL_INCLUDEDIR@")
 SET(RPLY_LIBRARY "@RPLY_LIBRARY@")
 
 
diff --git a/rply.spec b/rply.spec
index e49fc68..3ab52e9 100644
--- a/rply.spec
+++ b/rply.spec
@@ -12,7 +12,6 @@ BuildRequires:  cmake >= 2.6.0
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
 
-
 %description
 RPly is a library that lets applications read and write PLY files.
 The PLY file format is widely used to store geometric information, such as 3D
@@ -27,6 +26,13 @@ efficient, and well tested. The highlights are:
 * Input and output are buffered for efficiency;
 * Available under the MIT license for added freedom.
 
+%package	devel
+Summary:	Libraries and headers for rply
+Requires:	%{name}%{?_isa} = %{version}-%{release}
+
+%description devel
+Rply Library Header Files and Link Libraries
+
 %prep
 %autosetup -p1
 
@@ -52,24 +58,14 @@ iconv -f iso8859-1 -t utf-8 LICENSE > LICENSE.conv && mv -f LICENSE.conv LICENSE
 
 rm $RPM_BUILD_ROOT%{_datadir}/%{name}/rplyConfig.cmake
 
-
 %files
-%doc LICENSE
+%license LICENSE
 %doc manual/*
 %{_libdir}/*.so.*
 %{_bindir}/*
 
-
-%package        devel
-Summary:	Libraries and headers for rply
-Requires:	%{name} = %{version}-%{release}
-
-%description devel
-
-Rply Library Header Files and Link Libraries
-
 %files devel
-%doc LICENSE
+%license LICENSE
 %dir %{_includedir}/%{name}/
 %{_includedir}/%{name}/*
 %{_libdir}/*.so
diff --git a/rply_CMakeLists.txt b/rply_CMakeLists.txt
index a5a36d8..d6d177b 100644
--- a/rply_CMakeLists.txt
+++ b/rply_CMakeLists.txt
@@ -1,6 +1,8 @@
 PROJECT(rply)
 cmake_minimum_required(VERSION 2.6)
 
+include(GNUInstallDirs)
+
 SET(RPLY_LIB_MAJOR_VERSION 1)
 SET(RPLY_LIB_MINOR_VERSION 01)
 
@@ -11,7 +13,7 @@ add_library(rply SHARED rply.c )
 set_target_properties( rply PROPERTIES
                               VERSION ${RPLY_LIB_MAJOR_VERSION}.${RPLY_LIB_MINOR_VERSION}
                               SOVERSION ${RPLY_LIB_MAJOR_VERSION}
-                              ) 
+                              )
 
 include_directories( ${CMAKE_SOURCE_DIR} )
 add_executable(rply_convert etc/convert.c )
@@ -25,13 +27,10 @@ target_link_libraries (rply_sconvert rply)
 install(FILES rply.h DESTINATION include/rply)
 
 # Installs the target file
-install(TARGETS rply LIBRARY DESTINATION lib${LIB_SUFFIX})
+install(TARGETS rply LIBRARY DESTINATION ${LIBDIR})
 install(TARGETS rply_convert RUNTIME DESTINATION bin)
 install(TARGETS rply_dump RUNTIME DESTINATION bin)
 install(TARGETS rply_sconvert RUNTIME DESTINATION bin)
 
 #This should be the last line of the project
 SUBDIRS( CMake/export )
-
-
-
diff --git a/rply_cmake_export_cmakelists.txt b/rply_cmake_export_cmakelists.txt
index 896696e..1ac475f 100644
--- a/rply_cmake_export_cmakelists.txt
+++ b/rply_cmake_export_cmakelists.txt
@@ -8,7 +8,7 @@
 # Save the compiler settings so another project can import them.
 INCLUDE(${CMAKE_ROOT}/Modules/CMakeExportBuildSettings.cmake)
 SET(RPLY_BUILD_SETTINGS_FILE ${rply_BINARY_DIR}/RPLYBuildSettings.cmake)
-SET(RPLY_EXPORT_BUILD_SETTINGS_FILE 
+SET(RPLY_EXPORT_BUILD_SETTINGS_FILE
   ${CMAKE_INSTALL_PREFIX}/share/rply/cmake/RPLYBuildSettings.cmake
 )
 CMAKE_EXPORT_BUILD_SETTINGS(${RPLY_BUILD_SETTINGS_FILE})
@@ -17,7 +17,7 @@ CMAKE_EXPORT_BUILD_SETTINGS(${RPLY_BUILD_SETTINGS_FILE})
 CONFIGURE_FILE(${RPLY_CMAKE_DIR}Modules/RPLYConfig.cmake.in
                ${CMAKE_BINARY_DIR}/rplyConfig.cmake @ONLY IMMEDIATE)
 
-INSTALL_FILES(/share/rply FILES 
+INSTALL_FILES(/share/rply FILES
   ${CMAKE_BINARY_DIR}/rplyConfig.cmake
 #  ${RPLY_BINARY_DIR}/RPLYBuildSettings.cmake
 #  ${RPLY_BINARY_DIR}/RPLYLibraryDepends.cmake