diff --git a/common.am b/common.am
index 0f25abc..568f49c 100644
--- a/common.am
+++ b/common.am
@@ -23,10 +23,10 @@ endif
 smallicondir = $(shareddir)/icons/48x48
 bigicondir = $(shareddir)/icons/120x120
 
-librygelcoredir = $(top_srcdir)/src/librygel-core
-librygelserverdir = $(top_srcdir)/src/librygel-server
-librygelrendererdir = $(top_srcdir)/src/librygel-renderer
-librygelruihdir = $(top_srcdir)/src/librygel-ruih
+librygelcoredir = $(abs_top_srcdir)/src/librygel-core
+librygelserverdir = $(abs_top_srcdir)/src/librygel-server
+librygelrendererdir = $(abs_top_srcdir)/src/librygel-renderer
+librygelruihdir = $(abs_top_srcdir)/src/librygel-ruih
 
 MAINTAINERCLEANFILES = Makefile.in
 
@@ -48,7 +48,7 @@ RYGEL_COMMON_LIBRYGEL_CORE_LIBS = \
 	$(top_builddir)/src/librygel-core/librygel-core-2.6.la
 
 RYGEL_COMMON_LIBRYGEL_DB_VALAFLAGS = \
-	--vapidir=$(top_srcdir)/src/librygel-db \
+	--vapidir=$(abs_top_srcdir)/src/librygel-db \
 	--pkg rygel-db-2.6 \
 	$(RYGEL_COMMON_LIBRYGEL_CORE_VALAFLAGS)
 
@@ -62,7 +62,7 @@ RYGEL_COMMON_LIBRYGEL_DB_LIBS = \
 	$(top_builddir)/src/librygel-db/librygel-db-2.6.la
 
 RYGEL_COMMON_LIBRYGEL_RENDERER_VALAFLAGS = \
-	--vapidir=$(top_srcdir)/src/librygel-renderer \
+	--vapidir=$(abs_top_srcdir)/src/librygel-renderer \
 	--pkg rygel-renderer-2.6 \
 	$(RYGEL_COMMON_LIBRYGEL_CORE_VALAFLAGS)
 
@@ -77,8 +77,9 @@ RYGEL_COMMON_LIBRYGEL_RENDERER_LIBS = \
 
 
 RYGEL_COMMON_LIBRYGEL_RENDERER_GST_VALAFLAGS = \
-	--vapidir=$(top_srcdir)/src/librygel-renderer-gst \
+	--vapidir=$(abs_top_srcdir)/src/librygel-renderer-gst \
 	--pkg rygel-renderer-gst-2.6 \
+	--enable-experimental \
 	$(RYGEL_COMMON_LIBRYGEL_RENDERER_VALAFLAGS)
 
 RYGEL_COMMON_LIBRYGEL_RENDERER_GST_CFLAGS = \
diff --git a/src/librygel-core/Makefile.am b/src/librygel-core/Makefile.am
index 2261af1..249fe55 100644
--- a/src/librygel-core/Makefile.am
+++ b/src/librygel-core/Makefile.am
@@ -14,7 +14,7 @@ librygel_core_2_6_la_SOURCES = \
 librygel_core_2_6_la_VALAFLAGS = \
 	-H rygel-core.h -C --library=rygel-core-2.6 \
 	--gir=Rygel-2.6.gir \
-	--vapidir=$(srcdir) \
+	--vapidir=$(abs_srcdir) \
 	--pkg dlt \
 	$(LIBRYGEL_CORE_DEPS_VALAFLAGS) \
 	$(RYGEL_COMMON_VALAFLAGS)
diff --git a/src/plugins/playbin/Makefile.am b/src/plugins/playbin/Makefile.am
index aca7572..22faaf7 100644
--- a/src/plugins/playbin/Makefile.am
+++ b/src/plugins/playbin/Makefile.am
@@ -5,10 +5,7 @@ plugin_DATA = playbin.plugin
 
 librygel_playbin_la_SOURCES = rygel-playbin-module.vala rygel-playbin-plugin.vala
 librygel_playbin_la_VALAFLAGS = \
-	--pkg rygel-renderer-gst-2.6 \
-	--vapidir $(top_srcdir)/src/librygel-renderer-gst \
-	--enable-experimental \
-	$(RYGEL_COMMON_LIBRYGEL_RENDERER_VALAFLAGS) \
+	$(RYGEL_COMMON_LIBRYGEL_RENDERER_GST_VALAFLAGS) \
 	$(RYGEL_COMMON_VALAFLAGS)
 librygel_playbin_la_CFLAGS = \
 	$(RYGEL_PLUGIN_PLAYBIN_DEPS_CFLAGS) \
diff --git a/src/plugins/ruih/Makefile.am b/src/plugins/ruih/Makefile.am
index aa2f654..ef824c2 100644
--- a/src/plugins/ruih/Makefile.am
+++ b/src/plugins/ruih/Makefile.am
@@ -6,7 +6,7 @@ plugin_DATA = ruih.plugin
 librygel_ruih_la_SOURCES = rygel-ruih-module.vala rygel-ruih-plugin.vala
 librygel_ruih_la_VALAFLAGS = \
         --pkg rygel-ruih-2.0 \
-        --vapidir $(top_srcdir)/src/librygel-ruih \
+        --vapidir $(abs_top_srcdir)/src/librygel-ruih \
         $(RYGEL_COMMON_LIBRYGEL_RUIH_VALAFLAGS) \
         $(RYGEL_COMMON_VALAFLAGS)
 librygel_ruih_la_CFLAGS = \
