diff --git a/gst/rtpmanager/Makefile.am b/gst/rtpmanager/Makefile.am
index 683ca765ff..662b18caea 100644
--- a/gst/rtpmanager/Makefile.am
+++ b/gst/rtpmanager/Makefile.am
@@ -16,7 +16,9 @@ BUILT_SOURCES = $(built_sources) $(built_headers)
 
 libgstrtpmanager_la_SOURCES = gstrtpmanager.c \
 			      gstrtpbin.c \
+			      gstrtpdtmfmux.c \
 			      gstrtpjitterbuffer.c \
+			      gstrtpmux.c \
 			      gstrtpptdemux.c \
 			      gstrtpssrcdemux.c \
 			      rtpjitterbuffer.c      \
@@ -29,7 +31,9 @@ nodist_libgstrtpmanager_la_SOURCES = \
       $(built_sources)
 
 noinst_HEADERS = gstrtpbin.h \
+		 gstrtpdtmfmux.h \
 		 gstrtpjitterbuffer.h \
+		 gstrtpmux.h \
                  gstrtpptdemux.h \
                  gstrtpssrcdemux.h \
                  rtpjitterbuffer.h \
diff --git a/gst/rtpmanager/gstrtpmanager.c b/gst/rtpmanager/gstrtpmanager.c
index 8b4282f166..4e891e9fb7 100644
--- a/gst/rtpmanager/gstrtpmanager.c
+++ b/gst/rtpmanager/gstrtpmanager.c
@@ -26,6 +26,8 @@
 #include "gstrtpptdemux.h"
 #include "gstrtpsession.h"
 #include "gstrtpssrcdemux.h"
+#include "gstrtpdtmfmux.h"
+#include "gstrtpmux.h"
 
 static gboolean
 plugin_init (GstPlugin * plugin)
@@ -49,6 +51,12 @@ plugin_init (GstPlugin * plugin)
           GST_TYPE_RTP_SSRC_DEMUX))
     return FALSE;
 
+  if (!gst_rtp_mux_plugin_init (plugin))
+    return FALSE;
+
+  if (!gst_rtp_dtmf_mux_plugin_init (plugin))
+    return FALSE;
+
   return TRUE;
 }
 
diff --git a/gst/rtpmanager/gstrtpmuxer.c b/gst/rtpmanager/gstrtpmuxer.c
deleted file mode 100644
index e5bc466005..0000000000
--- a/gst/rtpmanager/gstrtpmuxer.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/* GStreamer RTP Muxer Plugins
- *
- * gstrtpdtmf.c:
- *
- * Copyright (C) <2007> Nokia Corporation.
- *   Contact: Zeeshan Ali <zeeshan.ali@nokia.com>
- * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *               2000,2005 Wim Taymans <wim@fluendo.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
-#include "gstrtpmux.h"
-#include "gstrtpdtmfmux.h"
-
-static gboolean
-plugin_init (GstPlugin * plugin)
-{
-  if (!gst_rtp_mux_plugin_init (plugin))
-    return FALSE;
-  if (!gst_rtp_dtmf_mux_plugin_init (plugin))
-    return FALSE;
-
-  return TRUE;
-}
-
-GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
-    GST_VERSION_MINOR,
-    rtpmux,
-    "RTP Muxer plugins",
-    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index 7177d86035..1a616cfe25 100644
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -142,6 +142,7 @@ check_PROGRAMS = \
 	elements/rtpbin \
 	elements/rtpbin_buffer_list \
 	elements/rtpjitterbuffer \
+	elements/rtpmux \
 	elements/shapewipe \
 	elements/spectrum \
 	elements/udpsink \
@@ -285,6 +286,9 @@ elements_rtpbin_buffer_list_LDADD = $(GST_PLUGINS_BASE_LIBS) \
              $(GST_BASE_LIBS) $(GST_LIBS) $(GST_CHECK_LIBS)
 elements_rtpbin_buffer_list_SOURCES = elements/rtpbin_buffer_list.c
 
+elements_rtpmux_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(AM_CFLAGS)
+elements_rtpmux_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstrtp-$(GST_API_VERSION) $(GST_BASE_LIBS) $(LDADD)
+
 elements_souphttpsrc_CFLAGS = $(SOUP_CFLAGS) $(AM_CFLAGS)
 elements_souphttpsrc_LDADD = $(SOUP_LIBS) $(LDADD)
 
diff --git a/tests/check/elements/.gitignore b/tests/check/elements/.gitignore
index da10e7d7db..58c724c5c7 100644
--- a/tests/check/elements/.gitignore
+++ b/tests/check/elements/.gitignore
@@ -47,6 +47,7 @@ rtp-payloading
 rtpbin
 rtpbin_buffer_list
 rtpjitterbuffer
+rtpmux
 shapewipe
 souphttpsrc
 spectrum