diff --git a/CMakeLists.txt b/CMakeLists.txt
index 63e2d92cdf..afb8fddf04 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -186,9 +186,9 @@ if(HIP_FOUND AND Libva_FOUND AND Libdrm_FOUND)
   set(rocDecode_DEBIAN_PACKAGE_LIST  "libva-dev, libdrm-dev")
   set(rocDecode_RPM_PACKAGE_LIST     "libva-devel, libdrm-devel")
   # Set the dev dependent packages
-  set(rocDecode_DEBIAN_DEV_PACKAGE_LIST  "ffmpeg, libavcodec-dev, libavformat-dev, libavutil-dev, libswscale-dev")
+  set(rocDecode_DEBIAN_DEV_PACKAGE_LIST  "ffmpeg, libavcodec-dev, libavformat-dev, libavutil-dev")
   # TBD - RPM packages need Fusion Packages
-  #set(rocDecode_RPM_DEV_PACKAGE_LIST  "ffmpeg, libavcodec-devel, libavformat-devel, libavutil-devel, libswscale-devel")
+  #set(rocDecode_RPM_DEV_PACKAGE_LIST  "ffmpeg, libavcodec-devel, libavformat-devel, libavutil-devel")
   
   # '%{?dist}' breaks manual builds on debian systems due to empty Provides
   execute_process(
diff --git a/rocDecode-setup.py b/rocDecode-setup.py
index 10214b8a39..dfc9ac7910 100644
--- a/rocDecode-setup.py
+++ b/rocDecode-setup.py
@@ -124,7 +124,7 @@ os.system('sudo '+linuxFlag+' '+linuxSystemInstall+' ' +
 if "Ubuntu" in platfromInfo:
     os.system('sudo -v')
     os.system('sudo '+linuxFlag+' '+linuxSystemInstall+' '+linuxSystemInstall_check +
-              ' install vainfo libva-dev libdrm-dev')
+              ' install vainfo libva-dev libdrm-dev libstdc++-12-dev')
 else:
     os.system('sudo -v')
     os.system('sudo '+linuxFlag+' '+linuxSystemInstall+' '+linuxSystemInstall_check +
@@ -135,7 +135,7 @@ if developerInstall == 'ON':
     if "Ubuntu" in platfromInfo:
         os.system('sudo -v')
         os.system('sudo '+linuxFlag+' '+linuxSystemInstall+' '+linuxSystemInstall_check +
-                ' install ffmpeg libavcodec-dev libavformat-dev libavutil-dev libswscale-dev')
+                ' install ffmpeg libavcodec-dev libavformat-dev libavutil-dev')
     else:
         os.system('sudo '+linuxFlag+' '+linuxSystemInstall+' '+linuxSystemInstall_check +
               ' install autoconf automake bzip2 bzip2-devel freetype-devel')