diff --git a/gst/rtp/Makefile.am b/gst/rtp/Makefile.am
index 1437518914..6c80d41ddd 100644
--- a/gst/rtp/Makefile.am
+++ b/gst/rtp/Makefile.am
@@ -1,6 +1,7 @@
 plugin_LTLIBRARIES = libgstrtp.la
 
 libgstrtp_la_SOURCES = \
+	dboolhuff.c \
 	fnv1hash.c \
 	gstrtp.c \
 	gstrtpchannels.c \
@@ -70,10 +71,13 @@ libgstrtp_la_SOURCES = \
 	gstrtptheorapay.c \
 	gstrtpvorbisdepay.c \
 	gstrtpvorbispay.c  \
+	gstrtpvp8depay.c \
+	gstrtpvp8pay.c \
 	gstrtpvrawdepay.c  \
 	gstrtpvrawpay.c 
 
-libgstrtp_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
+libgstrtp_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) \
+		$(GST_CFLAGS) -Dvp8_norm=gst_rtpvp8_vp8_norm
 libgstrtp_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
 		-lgstaudio-@GST_API_VERSION@ \
 		-lgstvideo-@GST_API_VERSION@ \
@@ -86,6 +90,7 @@ libgstrtp_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstrtp_la_LIBTOOLFLAGS = --tag=disable-static
 
 noinst_HEADERS =			\
+		 dboolhuff.h \
 		 fnv1hash.h 		\
                  gstrtpchannels.h       \
 		 gstrtpL16depay.h 	\
@@ -154,9 +159,13 @@ noinst_HEADERS =			\
 	 	 gstrtptheorapay.h      \
 	 	 gstrtpvorbisdepay.h    \
 	 	 gstrtpvorbispay.h      \
+		 gstrtpvp8depay.c \
+		 gstrtpvp8pay.c \
 	 	 gstrtpvrawdepay.h      \
 	 	 gstrtpvrawpay.h
 
+EXTRA_DIST = dboolhuff.LICENSE
+
 Android.mk: Makefile.am $(BUILT_SOURCES)
 	androgenizer \
 	-:PROJECT libgstrtp -:SHARED libgstrtp \
diff --git a/gst/rtp/gstrtp.c b/gst/rtp/gstrtp.c
index ca104ecb94..1dee25c8df 100644
--- a/gst/rtp/gstrtp.c
+++ b/gst/rtp/gstrtp.c
@@ -87,6 +87,8 @@
 #include "gstrtptheorapay.h"
 #include "gstrtpvorbisdepay.h"
 #include "gstrtpvorbispay.h"
+#include "gstrtpvp8depay.h"
+#include "gstrtpvp8pay.h"
 #include "gstrtpvrawdepay.h"
 #include "gstrtpvrawpay.h"
 
@@ -291,6 +293,12 @@ plugin_init (GstPlugin * plugin)
   if (!gst_rtp_vorbis_pay_plugin_init (plugin))
     return FALSE;
 
+  if (!gst_rtp_vp8_depay_plugin_init (plugin))
+    return FALSE;
+
+  if (!gst_rtp_vp8_pay_plugin_init (plugin))
+    return FALSE;
+
   if (!gst_rtp_vraw_depay_plugin_init (plugin))
     return FALSE;
 
diff --git a/gst/rtp/gstrtpvp8.c b/gst/rtp/gstrtpvp8.c
deleted file mode 100644
index d1d112f282..0000000000
--- a/gst/rtp/gstrtpvp8.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "gstrtpvp8pay.h"
-#include "gstrtpvp8depay.h"
-
-static gboolean
-plugin_init (GstPlugin *plugin)
-{
-  gst_rtp_vp8_depay_plugin_init (plugin);
-  gst_rtp_vp8_pay_plugin_init (plugin);
-
-  return TRUE;
-}
-
-GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
-    GST_VERSION_MINOR,
-    rtpvp8,
-    "rtpvp8",
-    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)