diff --git a/source/libjack/libjack_time.cpp b/source/libjack/libjack_time.cpp
index 4d7c4b89f..277c56de7 100644
--- a/source/libjack/libjack_time.cpp
+++ b/source/libjack/libjack_time.cpp
@@ -15,7 +15,6 @@
  * For a full copy of the GNU General Public License see the doc/GPL.txt file.
  */
 
-// need to include this first
 #include "libjack.hpp"
 
 CARLA_BACKEND_USE_NAMESPACE
diff --git a/source/plugin/Makefile b/source/plugin/Makefile
index b2e5ceda6..aa67729d9 100644
--- a/source/plugin/Makefile
+++ b/source/plugin/Makefile
@@ -103,6 +103,7 @@ endif
 # ----------------------------------------------------------------------------------------------------------------------------
 
 TARGETS = \
+	$(BINDIR)/carla-lv2-single$(LIB_EXT) \
 	$(BINDIR)/carla.lv2/carla$(LIB_EXT) \
 	$(BINDIR)/carla.lv2/manifest.ttl
 
@@ -129,12 +130,18 @@ clean:
 	rm -f $(OBJDIR)/*.o $(TARGETS)
 	rm -f $(BINDIR)/carla.lv2/*.*
 	rm -f $(BINDIR)/carla-lv2-export$(APP_EXT)
+	rm -f $(BINDIR)/carla-lv2-single$(LIB_EXT)
 
 debug:
 	$(MAKE) DEBUG=true
 
 # ----------------------------------------------------------------------------------------------------------------------------
 
+$(BINDIR)/carla-lv2-single$(LIB_EXT): $(OBJDIR)/carla-lv2-single.cpp.o $(LIBS)
+	-@mkdir -p $(BINDIR)
+	@echo "Linking carla-lv2-single$(LIB_EXT)"
+	@$(CXX) $< $(LIBS_START) $(LIBS) $(LIBS_END) $(SHARED) $(LINK_FLAGS) -o $@
+
 $(BINDIR)/carla.lv2/carla$(LIB_EXT): $(OBJDIR)/carla-lv2.cpp.o $(LIBS)
 	-@mkdir -p $(BINDIR)/carla.lv2
 	@echo "Linking carla.lv2/carla$(LIB_EXT)"
@@ -172,6 +179,11 @@ $(OBJDIR)/carla-lv2.cpp.o: carla-lv2.cpp
 	@echo "Compiling $<"
 	@$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
 
+$(OBJDIR)/carla-lv2-single.cpp.o: carla-lv2-single.cpp
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling $<"
+	@$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
+
 $(OBJDIR)/carla-vst.cpp.rack-fx.o: carla-vst.cpp
 	-@mkdir -p $(OBJDIR)
 	@echo "Compiling $< (RackFX)"
diff --git a/source/plugin/carla-lv2-single.cpp b/source/plugin/carla-lv2-single.cpp
new file mode 100644
index 000000000..8dd5e8658
--- /dev/null
+++ b/source/plugin/carla-lv2-single.cpp
@@ -0,0 +1,39 @@
+/*
+ * Carla LV2 Single Plugin
+ * Copyright (C) 2017 Filipe Coelho <falktx@falktx.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * For a full copy of the GNU General Public License see the doc/GPL.txt file.
+ */
+
+#include "CarlaLv2Utils.hpp"
+
+// -----------------------------------------------------------------------
+// Startup code
+
+CARLA_EXPORT
+const LV2_Descriptor* lv2_descriptor(uint32_t index)
+{
+    carla_debug("lv2_descriptor(%i)", index);
+
+    return nullptr;
+}
+
+CARLA_EXPORT
+const LV2UI_Descriptor* lv2ui_descriptor(uint32_t index)
+{
+    carla_debug("lv2ui_descriptor(%i)", index);
+
+    return nullptr;
+}
+
+// -----------------------------------------------------------------------