diff --git a/CMakeLists.txt b/CMakeLists.txt
index 182cc268a..148f65bdd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -146,7 +146,7 @@ if (USE_FFMPEG)
     find_package(FFmpeg)
     if (FFMPEG_FOUND)
         set(SOUND_INPUT_INCLUDES ${SOUND_INPUT_INCLUDES} ${FFMPEG_INCLUDE_DIRS})
-        set(SOUND_INPUT_LIBRARY ${SOUND_INPUT_LIBRARY} ${FFMPEG_LIBRARIES})
+        set(SOUND_INPUT_LIBRARY ${SOUND_INPUT_LIBRARY} ${FFMPEG_LIBRARIES} ${SWSCALE_LIBRARIES})
         set(SOUND_DEFINE ${SOUND_DEFINE} -DOPENMW_USE_FFMPEG)
         set(GOT_SOUND_INPUT 1)
     endif (FFMPEG_FOUND)
diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index 57e81e5ee..4f290c46f 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -110,11 +110,6 @@ target_link_libraries(openmw
     components
 )
 
-if (USE_FFMPEG)
-    target_link_libraries(openmw
-    "swscale")
-endif()
-
 # Fix for not visible pthreads functions for linker with glibc 2.15
 if (UNIX AND NOT APPLE)
 target_link_libraries(openmw ${CMAKE_THREAD_LIBS_INIT})
diff --git a/cmake/FindFFmpeg.cmake b/cmake/FindFFmpeg.cmake
index 526be5f1b..c80203a25 100644
--- a/cmake/FindFFmpeg.cmake
+++ b/cmake/FindFFmpeg.cmake
@@ -32,7 +32,7 @@ include(FindPackageHandleStandardArgs)
 
 # The default components were taken from a survey over other FindFFMPEG.cmake files
 if (NOT FFmpeg_FIND_COMPONENTS)
-  set(FFmpeg_FIND_COMPONENTS AVCODEC AVFORMAT AVUTIL)
+  set(FFmpeg_FIND_COMPONENTS AVCODEC AVFORMAT AVUTIL SWSCALE)
 endif ()
 
 #