diff -up ./cmake/FindFreeimage.cmake.fedora ./cmake/FindFreeimage.cmake
--- ./cmake/FindFreeimage.cmake.fedora	2014-04-12 07:21:02.000000000 -0400
+++ ./cmake/FindFreeimage.cmake	2014-06-09 18:16:43.557235237 -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	2014-04-12 07:21:02.000000000 -0400
+++ ./CMakeLists.txt	2014-06-09 18:17:18.598589513 -0400
@@ -174,8 +174,9 @@ endif()
 
 #####################################
 # Handle CFlags
-unset (CMAKE_C_FLAGS_ALL CACHE)
-unset (CMAKE_CXX_FLAGS CACHE)
+# (Please don't)
+#unset (CMAKE_C_FLAGS_ALL CACHE)
+#unset (CMAKE_CXX_FLAGS CACHE)
 
 # USE_HOST_CFLAGS (default TRUE)
 # Will check building host machine for proper cflags 
@@ -311,7 +312,6 @@ else (build_errors)
     gazebo_rendering
     gazebo_selection_buffer
     gazebo_sensors
-    gazebo_skyx
     gazebo_transport
     gazebo_util)
     
@@ -319,8 +319,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	2014-04-12 07:21:02.000000000 -0400
+++ ./cmake/SearchForStuff.cmake	2014-06-09 18:16:43.558235276 -0400
@@ -343,6 +343,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	2014-04-12 07:21:03.000000000 -0400
+++ ./gazebo/common/CMakeLists.txt	2014-06-09 18:16:43.558235276 -0400
@@ -124,6 +124,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	2014-04-12 07:21:03.000000000 -0400
+++ ./gazebo/rendering/Camera.cc	2014-06-09 18:16:43.558235276 -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	2014-04-12 07:21:03.000000000 -0400
+++ ./gazebo/rendering/CMakeLists.txt	2014-06-09 18:16:43.558235276 -0400
@@ -3,14 +3,21 @@ include (${gazebo_cmake_dir}/GazeboUtils
 include_directories(SYSTEM
   ${OGRE_INCLUDE_DIRS}
   ${CEGUI_INCLUDE_DIRS}
-  skyx
-  skyx/include
 )
 
+if (${SKYX_FOUND})
+  include_directories(SYSTEM ${SKYX_INCLUDE_DIRS})
+else ()
+  include_directories(SYSTEM skyx skyx/include)
+endif ()
+
 if (${OGRE_VERSION} GREATER 1.7.4)
   add_subdirectory(deferred_shading)
 endif()
-add_subdirectory(skyx)
+if (NOT SKYX_FOUND)
+  add_subdirectory(skyx)
+endif()
+
 add_subdirectory(selection_buffer)
 
 set (sources
@@ -131,7 +138,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}
@@ -139,6 +145,16 @@ target_link_libraries( gazebo_rendering
   ${CEGUI_LIBRARIES}
 )
 
+if (SKYX_FOUND)
+  target_link_libraries(gazebo_rendering
+    ${SKYX_LIBRARIES}
+  )
+else (SKYX_FOUND)
+  target_link_libraries (gazebo_rendering
+    gazebo_skyx)
+endif()
+
+
 if (NOT APPLE)
   target_link_libraries(gazebo_rendering X11)
 endif()
diff -up ./gazebo/rendering/Scene.cc.fedora ./gazebo/rendering/Scene.cc
--- ./gazebo/rendering/Scene.cc.fedora	2014-04-12 07:21:03.000000000 -0400
+++ ./gazebo/rendering/Scene.cc	2014-06-09 18:16:43.559235315 -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"