diff --git a/configure b/configure
index f93620c..4142e4f 100755
--- a/configure
+++ b/configure
@@ -43,7 +43,7 @@ case $targetos in
 		echo LIBSUF=.so
         echo "CXXFLAGS+=-pthread -Wall -fPIC `mlt-config --cflags`"
 		echo "LIBFLAGS=-shared"
-        echo "LDFLAGS+=`mlt-config --libs` `mlt-config miracle --libs`"
+        echo "LDFLAGS+=`mlt-config --libs` `mlt-config miracle --libs` `mlt-config valerie --libs`"
 		;;
 esac >> config.mak
 
diff --git a/test/Makefile b/test/Makefile
index e553221..f61ead7 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,16 +1,17 @@
 include ../config.mak
 
-CXXFLAGS+=-Wall -g `mlt-config --cflags` -I ../src
-LDFLAGS+=-L../src -lmlt++ -lmiracle -lvalerie `mlt-config --libs` -L/usr/trinity/lib
-CC=c++
+CXXFLAGS+=-g -I ../src
+LDFLAGS+=-L../src -lmlt++
 
 all:		play server
 
 play:		play.o
+	$(CXX) -o $@ $< $(LDFLAGS)
 
 play.o:		play.cpp
 
 server:		server.o
+	$(CXX) -o $@ $< $(LDFLAGS)
 
 server.o:	server.cpp