diff -up ./CMakeLists.txt.fedora ./CMakeLists.txt
--- ./CMakeLists.txt.fedora	2012-09-26 00:19:53.398940797 -0400
+++ ./CMakeLists.txt	2012-09-26 00:21:15.531071470 -0400
@@ -6,6 +6,7 @@ set (URDF_MINOR_VERSION 2)
 set (URDF_PATCH_VERSION 0)
 
 set (URDF_VERSION ${URDF_MAJOR_VERSION}.${URDF_MINOR_VERSION}.${URDF_PATCH_VERSION})
+set (URDF_INCLUDE_DIR "include/urdf" CACHE PATH "Installation directory for URDF headers")
 
 message (STATUS "${PROJECT_NAME} version ${URDF_VERSION}")
 
@@ -30,7 +31,7 @@ if (NOT MSVC)
   set(PACKAGE_DESC "Unified Robot Description Format")
   set(pkg_conf_file "${CMAKE_CURRENT_SOURCE_DIR}/cmake/pkgconfig/urdfdom_headers.pc")
   configure_file("${pkg_conf_file}.in" "${pkg_conf_file}" @ONLY)
-  install(FILES ${pkg_conf_file} DESTINATION lib/pkgconfig/ COMPONENT pkgconfig)
+  install(FILES ${pkg_conf_file} DESTINATION share/pkgconfig/ COMPONENT pkgconfig)
 endif()
 
 message(STATUS "Configuration successful. Type make install to install urdfdom_headers.")
diff -up ./cmake/pkgconfig/urdfdom_headers.pc.in.fedora ./cmake/pkgconfig/urdfdom_headers.pc.in
--- ./cmake/pkgconfig/urdfdom_headers.pc.in.fedora	2012-09-26 00:24:42.905977395 -0400
+++ ./cmake/pkgconfig/urdfdom_headers.pc.in	2012-09-26 00:25:01.338680207 -0400
@@ -1,7 +1,7 @@
 # This file was generated by CMake for @PROJECT_NAME@
 prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=${prefix}
-includedir=${prefix}/include
+includedir=${prefix}/@URDF_INCLUDE_DIR@
 
 Name: @PACKAGE_NAME@
 Description: @PACKAGE_DESC@
diff -up ./cmake/urdfdom_headers-config.cmake.in.fedora ./cmake/urdfdom_headers-config.cmake.in
--- ./cmake/urdfdom_headers-config.cmake.in.fedora	2012-09-26 00:23:27.451100554 -0400
+++ ./cmake/urdfdom_headers-config.cmake.in	2012-09-26 00:24:18.500046875 -0400
@@ -3,4 +3,4 @@ if (@PACKAGE_NAME@_CONFIG_INCLUDED)
 endif()
 set(@PACKAGE_NAME@_CONFIG_INCLUDED TRUE)
 
-set(@PACKAGE_NAME@_INCLUDE_DIRS @CMAKE_INSTALL_PREFIX@/include)
+set(@PACKAGE_NAME@_INCLUDE_DIRS @CMAKE_INSTALL_PREFIX@/@URDF_INCLUDE_DIR@)
diff -up ./urdf_exception/CMakeLists.txt.fedora ./urdf_exception/CMakeLists.txt
--- ./urdf_exception/CMakeLists.txt.fedora	2012-09-26 00:21:25.896466605 -0400
+++ ./urdf_exception/CMakeLists.txt	2012-09-26 00:22:02.333855630 -0400
@@ -1 +1 @@
-INSTALL(DIRECTORY include/urdf_exception DESTINATION include)
+INSTALL(DIRECTORY include/urdf_exception DESTINATION ${URDF_INCLUDE_DIR})
diff -up ./urdf_model/CMakeLists.txt.fedora ./urdf_model/CMakeLists.txt
--- ./urdf_model/CMakeLists.txt.fedora	2012-09-26 00:22:15.254348160 -0400
+++ ./urdf_model/CMakeLists.txt	2012-09-26 00:22:26.303769387 -0400
@@ -1 +1 @@
-INSTALL(DIRECTORY include/urdf_model DESTINATION include)
+INSTALL(DIRECTORY include/urdf_model DESTINATION ${URDF_INCLUDE_DIR})
diff -up ./urdf_model_state/CMakeLists.txt.fedora ./urdf_model_state/CMakeLists.txt
--- ./urdf_model_state/CMakeLists.txt.fedora	2012-09-26 00:22:34.669088296 -0400
+++ ./urdf_model_state/CMakeLists.txt	2012-09-26 00:22:44.447461056 -0400
@@ -1 +1 @@
-INSTALL(DIRECTORY include/urdf_model_state DESTINATION include)
+INSTALL(DIRECTORY include/urdf_model_state DESTINATION ${URDF_INCLUDE_DIR})
diff -up ./urdf_sensor/CMakeLists.txt.fedora ./urdf_sensor/CMakeLists.txt
--- ./urdf_sensor/CMakeLists.txt.fedora	2012-09-26 00:22:55.698890022 -0400
+++ ./urdf_sensor/CMakeLists.txt	2012-09-26 00:23:07.539341425 -0400
@@ -1 +1 @@
-INSTALL(DIRECTORY include/urdf_sensor DESTINATION include)
+INSTALL(DIRECTORY include/urdf_sensor DESTINATION ${URDF_INCLUDE_DIR})