diff --git a/gst/hls/.gsthlsdemux.c.swp b/gst/hls/.gsthlsdemux.c.swp
new file mode 100644
index 0000000000..3c45124012
Binary files /dev/null and b/gst/hls/.gsthlsdemux.c.swp differ
diff --git a/gst/hls/.gsthlssink.c.swp b/gst/hls/.gsthlssink.c.swp
new file mode 100644
index 0000000000..a02700203e
Binary files /dev/null and b/gst/hls/.gsthlssink.c.swp differ
diff --git a/gst/hls/Makefile.am b/gst/hls/Makefile.am
index 4f2b9070b3..f29ffbf1da 100644
--- a/gst/hls/Makefile.am
+++ b/gst/hls/Makefile.am
@@ -2,18 +2,18 @@
 plugin_LTLIBRARIES = libgstfragmented.la
 
 # FIXME: hlssink
-#	gsthlssink.c
-#	gstm3u8playlist.c
 libgstfragmented_la_SOURCES =			\
 	m3u8.c					\
 	gsthlsdemux.c				\
 	gstfragment.c				\
 	gsturidownloader.c			\
-	gstfragmentedplugin.c
+	gstfragmentedplugin.c 			\
+	gsthlssink.c 				\
+	gstm3u8playlist.c
 
 libgstfragmented_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(SOUP_CFLAGS) $(GIO_CFLAGS)
-# $(GST_PLUGINS_BAD_CFLAGS) -lgstpbutils-$(GST_MAJORMINOR) -lgstvideo-$(GST_MAJORMINOR)
-libgstfragmented_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(SOUP_LIBS) $(GIO_LIBS) $(LIBM)
+libgstfragmented_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(SOUP_LIBS) $(GIO_LIBS) $(LIBM) \
+			     -lgstpbutils-$(GST_API_VERSION) -lgstvideo-$(GST_API_VERSION)
 libgstfragmented_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -no-undefined
 libgstfragmented_la_LIBTOOLFLAGS = --tag=disable-static
 
diff --git a/gst/hls/gstfragmentedplugin.c b/gst/hls/gstfragmentedplugin.c
index f5650293a9..89a77412ad 100644
--- a/gst/hls/gstfragmentedplugin.c
+++ b/gst/hls/gstfragmentedplugin.c
@@ -6,9 +6,7 @@
 
 #include "gstfragmented.h"
 #include "gsthlsdemux.h"
-#if 0
 #include "gsthlssink.h"
-#endif
 
 GST_DEBUG_CATEGORY (fragmented_debug);
 
@@ -21,10 +19,8 @@ fragmented_init (GstPlugin * plugin)
           GST_TYPE_HLS_DEMUX) || FALSE)
     return FALSE;
 
-#if 0
   if (!gst_hls_sink_plugin_init (plugin))
     return FALSE;
-#endif
 
   return TRUE;
 }