diff -up ./PCL-1.6.0-Source/cmake/pcl_targets.cmake.fedora ./PCL-1.6.0-Source/cmake/pcl_targets.cmake
--- ./PCL-1.6.0-Source/cmake/pcl_targets.cmake.fedora	2012-07-17 19:11:32.000000000 -0400
+++ ./PCL-1.6.0-Source/cmake/pcl_targets.cmake	2012-09-24 21:53:34.066924229 -0400
@@ -1,5 +1,7 @@
 include(${PROJECT_SOURCE_DIR}/cmake/pcl_utils.cmake)
 
+set(PCL_PKGCONFIG_SUFFIX "-${PCL_MAJOR_VERSION}.${PCL_MINOR_VERSION}" CACHE STRING "Suffix to append to pkg-config files")
+
 ###############################################################################
 # Add an option to build a subsystem or not.
 # _var The name of the variable to store the option in.
@@ -412,14 +414,14 @@ macro(PCL_MAKE_PKGCONFIG _name _componen
     LIST_TO_STRING(_ext_deps_str "${_ext_deps}")
     set(PKG_EXTERNAL_DEPS ${_ext_deps_str})
     foreach(_dep ${_pcl_deps})
-      set(PKG_EXTERNAL_DEPS "${PKG_EXTERNAL_DEPS} pcl_${_dep}-${PCL_MAJOR_VERSION}.${PCL_MINOR_VERSION}")
+      set(PKG_EXTERNAL_DEPS "${PKG_EXTERNAL_DEPS} pcl_${_dep}${PCL_PKGCONFIG_SUFFIX}")
     endforeach(_dep)
     set(PKG_INTERNAL_DEPS "")
     foreach(_dep ${_int_deps})
         set(PKG_INTERNAL_DEPS "${PKG_INTERNAL_DEPS} -l${_dep}")
     endforeach(_dep)
 
-    set(_pc_file ${CMAKE_CURRENT_BINARY_DIR}/${_name}-${PCL_MAJOR_VERSION}.${PCL_MINOR_VERSION}.pc)
+    set(_pc_file ${CMAKE_CURRENT_BINARY_DIR}/${_name}${PCL_PKGCONFIG_SUFFIX}.pc)
     configure_file(${PROJECT_SOURCE_DIR}/cmake/pkgconfig.cmake.in ${_pc_file}
         @ONLY)
     install(FILES ${_pc_file} DESTINATION ${PKGCFG_INSTALL_DIR}
diff -up ./PCL-1.6.0-Source/io/CMakeLists.txt.fedora ./PCL-1.6.0-Source/io/CMakeLists.txt
--- ./PCL-1.6.0-Source/io/CMakeLists.txt.fedora	2012-07-17 19:11:32.000000000 -0400
+++ ./PCL-1.6.0-Source/io/CMakeLists.txt	2012-09-24 21:53:34.066924229 -0400
@@ -139,9 +139,10 @@ if(build)
     endif(OPENNI_FOUND)
 
     set(EXT_DEPS eigen3)
-    if(OPENNI_FOUND)
-      list(APPEND EXT_DEPS openni-dev)
-    endif(OPENNI_FOUND)
+    # Disable on Fedora, there is no pkg-config file
+    #if(OPENNI_FOUND)
+    #  list(APPEND EXT_DEPS openni-dev)
+    #endif(OPENNI_FOUND)
     PCL_MAKE_PKGCONFIG(${LIB_NAME} ${SUBSYS_NAME} "${SUBSYS_DESC}"
       "${SUBSYS_DEPS}" "${EXT_DEPS}" "" "" "")
 
diff -up ./PCL-1.6.0-Source/PCLConfig.cmake.in.fedora ./PCL-1.6.0-Source/PCLConfig.cmake.in
--- ./PCL-1.6.0-Source/PCLConfig.cmake.in.fedora	2012-07-17 19:11:32.000000000 -0400
+++ ./PCL-1.6.0-Source/PCLConfig.cmake.in	2012-09-24 21:53:58.239832655 -0400
@@ -392,9 +392,13 @@ if(WIN32)
 # PCLConfig.cmake is installed to PCL_ROOT/cmake
   get_filename_component(PCL_ROOT "${PCL_DIR}" PATH)
 else(WIN32)
-# PCLConfig.cmake is installed to PCL_ROOT/share/pcl-x.y
+  # PCLConfig.cmake is installed to PCL_ROOT/share/pcl-x.y or PCL_ROOT/lib${LIB_SUFFIX}/cmake/pcl
   get_filename_component(PCL_ROOT "${PCL_DIR}" PATH)
   get_filename_component(PCL_ROOT "${PCL_ROOT}" PATH)
+  if (${PCL_DIR} MATCHES ".*lib.*")
+    # PCLConfig.cmake is installed to PCL_ROOT/lib${LIB_SUFFIX}/cmake/pcl
+    get_filename_component(PCL_ROOT "${PCL_ROOT}" PATH)
+  endif()
 endif(WIN32)
 
 # check whether PCLConfig.cmake is found into a PCL installation or in a build tree
@@ -558,7 +562,7 @@ if(NOT "${PCL_LIBRARY_DIRS}" STREQUAL ""
 endif(NOT "${PCL_LIBRARY_DIRS}" STREQUAL "")
 
 # We need to export march=native for tutorials or user code
-list (APPEND PCL_DEFINITIONS "@SSE_FLAGS@")
+#list (APPEND PCL_DEFINITIONS "@SSE_FLAGS@")
 
 if(NOT "${PCL_DEFINITIONS}" STREQUAL "")
   list(REMOVE_DUPLICATES PCL_DEFINITIONS)
diff -up ./PCL-1.6.0-Source/visualization/CMakeLists.txt.fedora ./PCL-1.6.0-Source/visualization/CMakeLists.txt
--- ./PCL-1.6.0-Source/visualization/CMakeLists.txt.fedora	2012-07-17 19:11:32.000000000 -0400
+++ ./PCL-1.6.0-Source/visualization/CMakeLists.txt	2012-09-24 21:53:34.067924266 -0400
@@ -99,9 +99,9 @@ if(build)
     endif()
 
     set(EXT_DEPS "")
-    if(OPENNI_FOUND)
-      list(APPEND EXT_DEPS openni-dev)
-    endif(OPENNI_FOUND)
+    #if(OPENNI_FOUND)
+    #  list(APPEND EXT_DEPS openni-dev)
+    #endif(OPENNI_FOUND)
     PCL_MAKE_PKGCONFIG(${LIB_NAME} ${SUBSYS_NAME} "${SUBSYS_DESC}"
       "${SUBSYS_DEPS}" "${EXT_DEPS}" "" "" "")