diff --git a/libs/plugins/reasonablesynth.lv2/lv2.c b/libs/plugins/reasonablesynth.lv2/lv2.c
index 85aa968e8f..159f422c85 100644
--- a/libs/plugins/reasonablesynth.lv2/lv2.c
+++ b/libs/plugins/reasonablesynth.lv2/lv2.c
@@ -29,7 +29,7 @@
 #include "lv2/lv2plug.in/ns/ext/urid/urid.h"
 #include "lv2/lv2plug.in/ns/ext/midi/midi.h"
 
-#define RSY_URI "http://gareus.org/oss/lv2/reasonablesynth"
+#define RSY_URI "https://community.ardour.org/node/7596"
 
 /* the synth interface */
 static void *   synth_alloc      (void);
diff --git a/libs/plugins/reasonablesynth.lv2/manifest.ttl.in b/libs/plugins/reasonablesynth.lv2/manifest.ttl.in
index ad0cff08fa..92b20b40b8 100644
--- a/libs/plugins/reasonablesynth.lv2/manifest.ttl.in
+++ b/libs/plugins/reasonablesynth.lv2/manifest.ttl.in
@@ -1,8 +1,7 @@
 @prefix lv2:  <http://lv2plug.in/ns/lv2core#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix ui:    <http://lv2plug.in/ns/extensions/ui#> .
 
-<http://gareus.org/oss/lv2/reasonablesynth>
+<https://community.ardour.org/node/7596>
 	a lv2:Plugin ;
 	lv2:binary <reasonablesynth@LIB_EXT@>  ;
 	rdfs:seeAlso <reasonablesynth.ttl> .
diff --git a/libs/plugins/reasonablesynth.lv2/reasonablesynth.ttl.in b/libs/plugins/reasonablesynth.lv2/reasonablesynth.ttl.in
index 2b8861f3d6..fe4cddbad4 100644
--- a/libs/plugins/reasonablesynth.lv2/reasonablesynth.ttl.in
+++ b/libs/plugins/reasonablesynth.lv2/reasonablesynth.ttl.in
@@ -5,7 +5,6 @@
 @prefix rdf:   <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs:  <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix pg:    <http://lv2plug.in/ns/ext/port-groups#> .
-@prefix units: <http://lv2plug.in/ns/extensions/units#> .
 @prefix urid:  <http://lv2plug.in/ns/ext/urid#> .
 
 <http://gareus.org/rgareus#me>
@@ -14,7 +13,7 @@
 	foaf:mbox <mailto:robin@gareus.org> ;
 	foaf:homepage <http://gareus.org/> .
 
-<http://gareus.org/oss/lv2/reasonablesynth>
+<https://community.ardour.org/node/7596>
 	a lv2:Plugin, lv2:InstrumentPlugin, doap:Project;
 	doap:license <http://usefulinc.com/doap/licenses/gpl> ;
 	doap:maintainer <http://gareus.org/rgareus#me> ;
diff --git a/libs/plugins/reasonablesynth.lv2/wscript b/libs/plugins/reasonablesynth.lv2/wscript
index ba2ce8c9ab..797418c37f 100644
--- a/libs/plugins/reasonablesynth.lv2/wscript
+++ b/libs/plugins/reasonablesynth.lv2/wscript
@@ -15,30 +15,33 @@ def configure(conf):
     conf.load('compiler_c')
     autowaf.configure(conf)
     autowaf.set_c99_mode(conf)
-    autowaf.check_pkg(conf, 'lv2', atleast_version='1.4.1',
-            uselib_store='LV2_1_4_1')
+    if Options.options.lv2:
+        autowaf.check_pkg(conf, 'lv2', atleast_version='1.4.0',
+                uselib_store='LV2_1_4_0')
 
 def build(bld):
     bundle = 'reasonablesynth.lv2'
     module_pat = re.sub('^lib', '', bld.env.cshlib_PATTERN)
     module_ext = module_pat[module_pat.rfind('.'):]
 
-    # Build RDF files
-    for i in ['manifest.ttl', 'reasonablesynth.ttl']:
-        bld(features     = 'subst',
-            source       = i + '.in',
-            target       = '%s/%s' % (bundle, i),
-            install_path = '${LV2DIR}/%s' % bundle,
-            LIB_EXT      = module_ext)
+    if bld.is_defined ('HAVE_LV2'):
+        # Build RDF files
+        for i in ['manifest.ttl', 'reasonablesynth.ttl']:
+            bld(features     = 'subst',
+                source       = i + '.in',
+                target       = '../../LV2/%s/%s' % (bundle, i),
+                install_path = '${LV2DIR}/%s' % bundle,
+                LIB_EXT      = module_ext)
 
-    # Build plugin library
-    obj = bld(features     = 'c cshlib',
-              source       = 'lv2.c',
-              dep_files    = 'rsynth.c',
-              name         = 'reasonablesynth',
-              target       = '%s/reasonablesynth' % bundle,
-              install_path = '${LV2DIR}/%s' % bundle,
-              use          = 'LV2_1_4_1')
-    obj.env.cshlib_PATTERN = module_pat
+        # Build plugin library
+        obj = bld(features     = 'c cshlib',
+                  source       = 'lv2.c',
+                  dep_files    = 'rsynth.c',
+                  name         = 'reasonablesynth',
+                  target       = '../../LV2/%s/reasonablesynth' % bundle,
+                  install_path = '${LV2DIR}/%s' % bundle,
+                  use          = 'LV2_1_4_0'
+                  )
+        obj.env.cshlib_PATTERN = module_pat
 
 # vi:set ts=4 sw=4 et:
diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build
index 3bf793a637..e7f7d8b6dd 100755
--- a/tools/linux_packaging/build
+++ b/tools/linux_packaging/build
@@ -534,6 +534,9 @@ cp -R ../../gtk2_ardour/splash.png $Shared
 cp -R ../../gtk2_ardour/small-splash.png $Shared
 cp -R ../../gtk2_ardour/ArdourMono.ttf $Shared
 
+# install bundled LV2s to <app>/lib/LV2/
+cp -R $BUILD_ROOT/libs/LV2 $APPLIB/
+
 # go through and recursively remove any .svn dirs in the bundle
 for svndir in `find $APPDIR -name .svn -type d`; do
 	rm -rf $svndir
diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build
index 276eb90fe5..e3e4a23915 100755
--- a/tools/osx_packaging/osx_build
+++ b/tools/osx_packaging/osx_build
@@ -417,6 +417,9 @@ for svndir in `find $APPDIR -name .svn -type dir`; do
     rm -rf $svndir
 done
 
+# install bundled LV2s to <app>/Contents/lib/LV2/
+cp -R $BUILD_ROOT/libs/LV2 $Frameworks/
+
 # now fix up the executables
 echo "Fixing up executable dependency names ..."
 executables=$MAIN_EXECUTABLE