diff --git a/openscenegraph/Makefile b/openscenegraph/Makefile
index 124ee4d9db0617627249a6e54900c9157bbf9477..33691431340a5cda59d62b4288e65466ee9a2dc3 100644
--- a/openscenegraph/Makefile
+++ b/openscenegraph/Makefile
@@ -5,6 +5,7 @@
 ORG=			openscenegraph
 NAME=			OpenSceneGraph
 VERSION=		3.6.5
+PKGREVISION=		1
 
 DISTNAME=		${NAME}-${VERSION}
 MASTER_SITES=		${MASTER_SITE_GITHUB:=${ORG}/${NAME}}/archive/
diff --git a/openscenegraph/PLIST b/openscenegraph/PLIST
index 7471bc8186c04febd412ccd8066e3a9bb45f0027..102a13299ac33349e68dfeeded5a3096d0ab26a8 100644
--- a/openscenegraph/PLIST
+++ b/openscenegraph/PLIST
@@ -699,11 +699,7 @@ lib/osgPlugins-${PKGVERSION}/osgdb_deprecated_osgvolume.so
 lib/osgPlugins-${PKGVERSION}/osgdb_deprecated_osgwidget.so
 lib/osgPlugins-${PKGVERSION}/osgdb_dot.so
 lib/osgPlugins-${PKGVERSION}/osgdb_dxf.so
-lib/osgPlugins-${PKGVERSION}/osgdb_exr.so
-lib/osgPlugins-${PKGVERSION}/osgdb_ffmpeg.so
 lib/osgPlugins-${PKGVERSION}/osgdb_freetype.so
-lib/osgPlugins-${PKGVERSION}/osgdb_gdal.so
-lib/osgPlugins-${PKGVERSION}/osgdb_gif.so
 lib/osgPlugins-${PKGVERSION}/osgdb_gles.so
 lib/osgPlugins-${PKGVERSION}/osgdb_glsl.so
 lib/osgPlugins-${PKGVERSION}/osgdb_gz.so
@@ -719,7 +715,6 @@ lib/osgPlugins-${PKGVERSION}/osgdb_md2.so
 lib/osgPlugins-${PKGVERSION}/osgdb_mdl.so
 lib/osgPlugins-${PKGVERSION}/osgdb_normals.so
 lib/osgPlugins-${PKGVERSION}/osgdb_obj.so
-lib/osgPlugins-${PKGVERSION}/osgdb_ogr.so
 lib/osgPlugins-${PKGVERSION}/osgdb_openflight.so
 lib/osgPlugins-${PKGVERSION}/osgdb_osc.so
 lib/osgPlugins-${PKGVERSION}/osgdb_osg.so
diff --git a/openscenegraph/distinfo b/openscenegraph/distinfo
index deac06f20cf6133c3e58cfb6615170175333b63c..7fb4b088d5a7362a3799969f42a303a332c768b7 100644
--- a/openscenegraph/distinfo
+++ b/openscenegraph/distinfo
@@ -3,3 +3,4 @@ RMD160 (OpenSceneGraph-3.6.5.tar.gz) = 1b9e1fd9250f5c3de85966d94edf5be393fa3928
 Size (OpenSceneGraph-3.6.5.tar.gz) = 5780762 bytes
 SHA1 (patch-aa) = e31ca9eeae33c1b586d9e8332884648d07f2aa90
 SHA1 (patch-ab) = e74f3e82d40c9201c23345df90aad036a2d4c107
+SHA1 (patch-ac) = c0cd50f891b081a73dfb7a52a31921dd8df69d2a
diff --git a/openscenegraph/patches/patch-ac b/openscenegraph/patches/patch-ac
new file mode 100644
index 0000000000000000000000000000000000000000..499080a3afbe084cd1e96192301d3ef61300e030
--- /dev/null
+++ b/openscenegraph/patches/patch-ac
@@ -0,0 +1,32 @@
+Deactivate plugins not available on all robotpkg targets
+
+--- src/osgPlugins/CMakeLists.txt.orig	2020-01-31 12:03:07.000000000 +0100
++++ src/osgPlugins/CMakeLists.txt	2020-05-30 12:44:19.876536382 +0200
+@@ -106,10 +106,8 @@
+     ADD_PLUGIN_DIRECTORY(jp2)
+ ENDIF()
+ IF(OPENEXR_FOUND AND ZLIB_FOUND AND OSG_CPP_EXCEPTIONS_AVAILABLE)
+-    ADD_PLUGIN_DIRECTORY(exr)
+ ENDIF()
+ IF(GIFLIB_FOUND)
+-    ADD_PLUGIN_DIRECTORY(gif)
+ ENDIF()
+ IF(PNG_FOUND AND OSG_CPP_EXCEPTIONS_AVAILABLE)
+     ADD_PLUGIN_DIRECTORY(png)
+@@ -118,8 +116,6 @@
+     ADD_PLUGIN_DIRECTORY(tiff)
+ ENDIF()
+ IF(GDAL_FOUND)
+-    ADD_PLUGIN_DIRECTORY(gdal)
+-    ADD_PLUGIN_DIRECTORY(ogr)
+ ENDIF()
+ IF(GTA_FOUND AND OSG_CPP_EXCEPTIONS_AVAILABLE)
+     ADD_PLUGIN_DIRECTORY(gta)
+@@ -210,7 +206,6 @@
+ ENDIF()
+ 
+ IF(FFMPEG_FOUND AND OSG_CPP_EXCEPTIONS_AVAILABLE)
+-    ADD_PLUGIN_DIRECTORY(ffmpeg)
+ ENDIF()
+ 
+ IF(GSTREAMER_FOUND AND GLIB_FOUND)