diff -up ./cmake/FindFreeimage.cmake.fedora ./cmake/FindFreeimage.cmake
--- ./cmake/FindFreeimage.cmake.fedora	2015-01-29 10:09:35.000000000 -0500
+++ ./cmake/FindFreeimage.cmake	2015-05-23 11:47:34.324056774 -0400
@@ -4,7 +4,7 @@ include (${gazebo_cmake_dir}/GazeboUtils
 ########################################
 # Find packages
 if (PKG_CONFIG_FOUND)
-  pkg_check_modules(freeimage freeimage>=${FREEIMAGE_VERSION})
+  pkg_check_modules(freeimage freeimage>=${MIN_FREEIMAGE_VERSION})
   if (NOT freeimage_FOUND)
     message (STATUS "  freeimage.pc not found, trying freeimage_include_dir and freeimage_library_dir flags.")
   endif (NOT freeimage_FOUND)
diff -up ./CMakeLists.txt.fedora ./CMakeLists.txt
--- ./CMakeLists.txt.fedora	2015-01-29 10:09:35.000000000 -0500
+++ ./CMakeLists.txt	2015-05-23 11:47:34.324056774 -0400
@@ -348,7 +348,6 @@ else (build_errors)
     gazebo_rendering
     gazebo_selection_buffer
     gazebo_sensors
-    gazebo_skyx
     gazebo_transport
     gazebo_util)
 
@@ -356,8 +355,8 @@ else (build_errors)
     set(PKG_LIBRARIES ${PKG_LIBRARIES} gazebo_ccd)
   endif()
 
-  if (INCLUDE_PLAYER)
-    set(PKG_LIBRARIES ${PKG_LIBRARIES} gazebo_player)
+  if (NOT SKYX_FOUND)
+    set(PKG_LIBRARIES ${PKG_LIBRARIES} gazebo_skyx)
   endif()
 
   if (HAVE_BULLET)
diff -up ./cmake/SearchForStuff.cmake.fedora ./cmake/SearchForStuff.cmake
--- ./cmake/SearchForStuff.cmake.fedora	2015-01-29 10:09:35.000000000 -0500
+++ ./cmake/SearchForStuff.cmake	2015-05-23 11:47:34.324056774 -0400
@@ -318,6 +318,13 @@ if (PKG_CONFIG_FOUND)
   endif ()
 
   ########################################
+  # Find SkyX
+  pkg_check_modules(SKYX SKYX)
+  if (NOT SKYX_FOUND)
+    BUILD_WARNING("SkyX not found, using private copy of SkyX")
+  endif()
+
+  ########################################
   # Find Player
   pkg_check_modules(PLAYER playercore>=3.0 playerc++ playerwkb)
   if (NOT PLAYER_FOUND)
diff -up ./gazebo/common/CMakeLists.txt.fedora ./gazebo/common/CMakeLists.txt
--- ./gazebo/common/CMakeLists.txt.fedora	2015-01-29 10:09:35.000000000 -0500
+++ ./gazebo/common/CMakeLists.txt	2015-05-23 11:47:34.325056813 -0400
@@ -127,6 +127,7 @@ set (gtest_sources
 if (HAVE_FFMPEG)
   set (gtest_sources ${gtest_sources}
                      AudioDecoder_TEST.cc)
+  include_directories(${LIBAVFORMAT_PATH} ${LIBAVCODEC_PATH})
 endif()
 
 gz_build_tests(${gtest_sources})
diff -up ./gazebo/rendering/Camera.cc.fedora ./gazebo/rendering/Camera.cc
--- ./gazebo/rendering/Camera.cc.fedora	2015-01-29 10:09:35.000000000 -0500
+++ ./gazebo/rendering/Camera.cc	2015-05-23 11:47:34.325056813 -0400
@@ -23,7 +23,7 @@
 // Moved to top to avoid osx compilation errors
 #include "gazebo/math/Rand.hh"
 
-#include "gazebo/rendering/skyx/include/SkyX.h"
+#include "SkyX.h"
 
 #include "gazebo/common/Assert.hh"
 #include "gazebo/common/Events.hh"
diff -up ./gazebo/rendering/CMakeLists.txt.fedora ./gazebo/rendering/CMakeLists.txt
--- ./gazebo/rendering/CMakeLists.txt.fedora	2015-01-29 10:09:35.000000000 -0500
+++ ./gazebo/rendering/CMakeLists.txt	2015-05-23 13:06:07.457151877 -0400
@@ -9,7 +9,11 @@ include_directories(SYSTEM
 if (${OGRE_VERSION} GREATER 1.7.4)
   add_subdirectory(deferred_shading)
 endif()
-add_subdirectory(skyx)
+if (${SKYX_FOUND})
+  include_directories(SYSTEM ${SKYX_INCLUDE_DIRS})
+else()
+  add_subdirectory(skyx)
+endif()
 add_subdirectory(selection_buffer)
 
 set (sources
@@ -144,7 +148,6 @@ gz_add_library(gazebo_rendering ${source
 target_link_libraries(gazebo_rendering
   gazebo_common
   gazebo_msgs
-  gazebo_skyx
   gazebo_selection_buffer
   gazebo_transport
   ${ogre_libraries}
@@ -165,5 +168,9 @@ if (${OGRE_VERSION} GREATER 1.7.4)
   target_link_libraries(gazebo_rendering gazebo_rendering_deferred)
 endif()
 
+if (${SKYX_FOUND})
+  target_link_libraries(gazebo_rendering ${SKYX_LIBRARIES})
+endif()
+
 gz_install_library(gazebo_rendering)
 gz_install_includes("rendering" ${headers} ${CMAKE_CURRENT_BINARY_DIR}/rendering.hh)
diff -up ./gazebo/rendering/Scene.cc.fedora ./gazebo/rendering/Scene.cc
--- ./gazebo/rendering/Scene.cc.fedora	2015-01-29 10:09:35.000000000 -0500
+++ ./gazebo/rendering/Scene.cc	2015-05-23 11:47:34.326056853 -0400
@@ -16,7 +16,7 @@
 */
 #include <boost/lexical_cast.hpp>
 
-#include "gazebo/rendering/skyx/include/SkyX.h"
+#include "SkyX.h"
 #include "gazebo/rendering/ogre_gazebo.h"
 
 #include "gazebo/msgs/msgs.hh"