diff --git a/Makefile.in b/Makefile.in
index bc6ed01..2dc0e37 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2,8 +2,13 @@
 all:	bin lib bin/rubberband lib/librubberband.a lib/vamp-rubberband.so lib/ladspa-rubberband.so
 
 CXX		= @CXX@
-CXXFLAGS	= @CXXFLAGS@ @SRC_CFLAGS@ @SNDFILE_CFLAGS@ @FFTW_CFLAGS@ @FFTWF_CFLAGS@ -Irubberband -Isrc
-LDFLAGS		= @LDFLAGS@ @SRC_LIBS@ @SNDFILE_LIBS@ @FFTW_LIBS@ @FFTWF_LIBS@
+CXXFLAGS	= @CXXFLAGS@ @SRC_CFLAGS@ @SNDFILE_CFLAGS@ @FFTW_CFLAGS@ @FFTWF_CFLAGS@ @VAMP_CFLAGS@ -Irubberband -Isrc
+LDFLAGS		= @LDFLAGS@ 
+
+LIBRARY_LIBS		= @SRC_LIBS@ @FFTW_LIBS@ @FFTWF_LIBS@
+PROGRAM_LIBS		= @SNDFILE_LIBS@ $(LIBRARY_LIBS)
+VAMP_PLUGIN_LIBS	= @VAMP_LIBS@ $(LIBRARY_LIBS)
+LADSPA_PLUGIN_LIBS	= $(LIBRARY_LIBS)
 
 MKDIR		= mkdir
 AR		= ar
@@ -72,19 +77,19 @@ VAMP_OBJECTS    := $(VAMP_SOURCES:.cpp=.o)
 LADSPA_OBJECTS  := $(LADSPA_SOURCES:.cpp=.o)
 
 $(PROGRAM_TARGET):	$(LIBRARY_OBJECTS) $(PROGRAM_OBJECTS)
-	$(CXX) -o $@ $^ $(LDFLAGS)
+	$(CXX) -o $@ $^ $(PROGRAM_LIBS) $(PROGRAM_LIBS) $(LDFLAGS)
 
 $(STATIC_TARGET):	$(LIBRARY_OBJECTS)
 	$(AR) rsc $@ $^
 
 $(DYNAMIC_TARGET):	$(LIBRARY_OBJECTS)
-	$(CXX) -shared -Wl,-Bsymbolic $^ -o $@ $(LDFLAGS)
+	$(CXX) -shared -Wl,-Bsymbolic $^ -o $@ $(LIBRARY_LIBS) $(LDFLAGS)
 
 $(VAMP_TARGET):		$(LIBRARY_OBJECTS) $(VAMP_OBJECTS)
 	$(CXX) -shared -Wl,-Bsymbolic -o $@ $^ $(VAMP_PLUGIN_LIBS) $(LDFLAGS)
 
 $(LADSPA_TARGET):	$(LIBRARY_OBJECTS) $(LADSPA_OBJECTS)
-	$(CXX) -shared -Wl,-Bsymbolic -o $@ $^ $(LDFLAGS)
+	$(CXX) -shared -Wl,-Bsymbolic -o $@ $^ $(LADSPA_PLUGIN_LIBS) $(LDFLAGS)
 
 bin:
 	$(MKDIR) $@
diff --git a/configure.ac b/configure.ac
index 635e12d..0f64877 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,6 +22,12 @@ PKG_CHECK_MODULES([FFTW],[fftw3])
 AC_SUBST(FFTW_CFLAGS)
 AC_SUBST(FFTW_LIBS)
 
+AC_CHECK_HEADERS(ladspa.h)
+
+PKG_CHECK_MODULES([VAMP],[vamp-sdk])
+AC_SUBST(VAMP_CFLAGS)
+AC_SUBST(VAMP_LIBS)
+
 changequote(,)dnl
 if test "x$GCC" = "xyes"; then
   case " $CXXFLAGS " in