diff --git a/CMakeLists.txt b/CMakeLists.txt
index 03e0860..0974fe8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,9 +40,9 @@ set(FFMPEG_PKGCONFIG "" CACHE STRING "extra path to pkgconfig")
 if("${FFMPEG_PKGCONFIG}" STREQUAL "")
 else()
   message(WARNING "using FFMPEG package from ${FFMPEG_PKGCONFIG}")
+  set(ENV{PKG_CONFIG_PATH} "${FFMPEG_PKGCONFIG}:$ENV{PKG_CONFIG_PATH}")
 endif()
 
-set(ENV{PKG_CONFIG_PATH} ${FFMPEG_PKGCONFIG})
 find_package(PkgConfig REQUIRED)
 
 pkg_check_modules(LIBAV REQUIRED IMPORTED_TARGET
@@ -51,21 +51,6 @@ pkg_check_modules(LIBAV REQUIRED IMPORTED_TARGET
     libswscale
     libavutil)
 
-
-set(FFMPEG_PKGCONFIG "" CACHE STRING "extra path to pkgconfig")
-if("${FFMPEG_PKGCONFIG}" STREQUAL "")
-else()
-  message(WARNING "using FFMPEG package from ${FFMPEG_PKGCONFIG}")
-endif()
-
-set(ENV{PKG_CONFIG_PATH} ${FFMPEG_PKGCONFIG})
-find_package(PkgConfig REQUIRED)
-pkg_check_modules(LIBAV REQUIRED IMPORTED_TARGET
-    libavcodec
-    libswresample
-    libswscale
-    libavutil)
-
 if(LIBAV_libavcodec_VERSION VERSION_GREATER_EQUAL 60.0.0)
   add_definitions(-DUSE_AV_FLAGS)
 endif()
diff --git a/cmake/ffmpeg_encoder_decoder-extras.cmake.in b/cmake/ffmpeg_encoder_decoder-extras.cmake.in
index 8463d67..4a6fbd9 100644
--- a/cmake/ffmpeg_encoder_decoder-extras.cmake.in
+++ b/cmake/ffmpeg_encoder_decoder-extras.cmake.in
@@ -1,5 +1,7 @@
 set(FFMPEG_PKGCONFIG "" CACHE STRING "extra path to pkgconfig")
-set(ENV{PKG_CONFIG_PATH} ${FFMPEG_PKGCONFIG})
+if(NOT "${FFMPEG_PKGCONFIG}" STREQUAL "")
+  set(ENV{PKG_CONFIG_PATH} "${FFMPEG_PKGCONFIG}:$ENV{PKG_CONFIG_PATH}")
+endif()
 
 find_package(PkgConfig REQUIRED)