diff --git a/games-engines/openscenegraph/openscenegraph-3.6.3.recipe b/games-engines/openscenegraph/openscenegraph-3.6.3.recipe
index 164c3690b..9c200820b 100644
--- a/games-engines/openscenegraph/openscenegraph-3.6.3.recipe
+++ b/games-engines/openscenegraph/openscenegraph-3.6.3.recipe
@@ -10,7 +10,7 @@ virtual reality industries."
 HOMEPAGE="http://www.openscenegraph.org/"
 COPYRIGHT="2002-2018 Robert Osfield and others"
 LICENSE="OSGPL"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-$portVersion.tar.gz"
 CHECKSUM_SHA256="51bbc79aa73ca602cd1518e4e25bd71d41a10abd296e18093a8acfebd3c62696"
 SOURCE_DIR="OpenSceneGraph-OpenSceneGraph-$portVersion"
@@ -180,6 +180,10 @@ INSTALL()
 	mv $prefix/lib-temp/* $libDir
 	rm -rf $prefix/lib-temp
 
+	# Move plugins to system addons directory
+	mkdir -p $addOnsDir
+	mv $libDir/osgPlugins-$portVersion $addOnsDir
+
 	prepareInstalledDevelLibs libOpenThreads libosg libosgAnimation libosgDB \
 		libosgFX libosgGA libosgManipulator libosgParticle libosgPresentation \
 		libosgShadow libosgSim libosgTerrain libosgText libosgUI libosgUtil \
diff --git a/games-engines/openscenegraph/patches/openscenegraph-3.6.3.patchset b/games-engines/openscenegraph/patches/openscenegraph-3.6.3.patchset
index 977c33e0a..3017c7389 100644
--- a/games-engines/openscenegraph/patches/openscenegraph-3.6.3.patchset
+++ b/games-engines/openscenegraph/patches/openscenegraph-3.6.3.patchset
@@ -1,4 +1,4 @@
-From 3e731d32a286903a4b75d445ec6fdf0b8359b5d9 Mon Sep 17 00:00:00 2001
+From a3b9a24af5909d8eb65008efb728dd770c96d0f0 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?=
  <adrian.arroyocalle@gmail.com>
 Date: Wed, 24 Dec 2014 14:55:21 +0000
@@ -47,5 +47,46 @@ index fe135f4..680fcfe 100644
          #if (__BYTE_ORDER == __LITTLE_ENDIAN)
              #ifndef __LITTLE_ENDIAN__
 -- 
-2.16.4
+2.19.0
+
+
+From 042f3d4f95684441e7da6af87f53697d88caa3a6 Mon Sep 17 00:00:00 2001
+From: Gerasim Troeglazov <3dEyes@gmail.com>
+Date: Mon, 8 Oct 2018 00:19:11 +1000
+Subject: Find plugins in system lib and addons directory
+
+
+diff --git a/src/osgDB/FileUtils.cpp b/src/osgDB/FileUtils.cpp
+index a2c8102..6c95cf2 100644
+--- a/src/osgDB/FileUtils.cpp
++++ b/src/osgDB/FileUtils.cpp
+@@ -758,6 +758,26 @@ bool osgDB::containsCurrentWorkingDirectoryReference(const FilePathList& paths)
+         convertStringPathIntoFilePathList("/usr/bin/:/usr/local/bin/",filepath);
+     }
+ 
++#elif defined(__HAIKU__)
++
++    void osgDB::appendPlatformSpecificLibraryFilePaths(FilePathList& filepath)
++    {
++
++       char* ptr;
++       if( (ptr = getenv( "LD_LIBRARY_PATH" )) )
++        {
++            convertStringPathIntoFilePathList(ptr,filepath);
++        }
++
++        appendInstallationLibraryFilePaths(filepath);
++
++#if defined(__ia64__) || defined(__x86_64__)
++        convertStringPathIntoFilePathList("/system/lib/:/system/add-ons/",filepath);
++#else
++        convertStringPathIntoFilePathList("/system/lib/x86/:/system/add-ons/x86/",filepath);
++#endif
++    }
++
+ #elif defined(WIN32)
+ 
+     void osgDB::appendPlatformSpecificLibraryFilePaths(FilePathList& filepath)
+-- 
+2.19.0