diff --git a/libs/ardour/SConscript b/libs/ardour/SConscript
index d8d6885156..733feb2c00 100644
--- a/libs/ardour/SConscript
+++ b/libs/ardour/SConscript
@@ -57,7 +57,6 @@ insert.cc
 io.cc
 jack_slave.cc
 ladspa_plugin.cc
-lv2_plugin.cc
 location.cc
 mtc_slave.cc
 named_selection.cc
@@ -103,6 +102,7 @@ arch_specific_objects = [ ]
 
 osc_files = [ 'osc.cc' ]
 vst_files = [ 'vst_plugin.cc', 'session_vst.cc' ]
+lv2_files = [ 'lv2_plugin.cc' ]
 audiounit_files = [ 'audio_unit.cc' ]
 coreaudio_files = [ 'coreaudiosource.cc' ]
 extra_sources = [ ]
@@ -113,6 +113,7 @@ if ardour['VST']:
 	ardour.Append(CCFLAGS="-DVST_SUPPORT", CPPPATH="#libs/fst")
 
 if ardour['LV2']:
+	extra_sources += lv2_files
 	ardour.Append(CCFLAGS="-DHAVE_SLV2")
 
 if ardour['LIBLO']:
diff --git a/libs/ardour/plugin_manager.cc b/libs/ardour/plugin_manager.cc
index 183948f373..45b7a7416c 100644
--- a/libs/ardour/plugin_manager.cc
+++ b/libs/ardour/plugin_manager.cc
@@ -106,8 +106,10 @@ PluginManager::PluginManager ()
 		ladspa_plugin_whitelist.push_back (2150); // tap pitch shifter
 	} 
 
+#ifdef HAVE_SLV2
 	_lv2_world = slv2_world_new();
 	slv2_world_load_all(_lv2_world);
+#endif
 
 	refresh ();
 }