diff --git a/gst/asfdemux/Makefile.am b/gst/asfdemux/Makefile.am
index d521a13fdb..5b0b29aa8a 100644
--- a/gst/asfdemux/Makefile.am
+++ b/gst/asfdemux/Makefile.am
@@ -1,14 +1,9 @@
 
-plugin_LTLIBRARIES = libgstasfdemux.la libgstasfmux.la
+plugin_LTLIBRARIES = libgstasf.la
 
-libgstasfdemux_la_SOURCES = gstasfdemux.c
-libgstasfdemux_la_CFLAGS = $(GST_CFLAGS)
-libgstasfdemux_la_LIBADD =
-libgstasfdemux_la_LDFLAGS = $(GST_LIBS)
-
-libgstasfmux_la_SOURCES = gstasfmux.c
-libgstasfmux_la_CFLAGS = $(GST_CFLAGS)
-libgstasfmux_la_LIBADD =
-libgstasfmux_la_LDFLAGS = $(GST_LIBS)
+libgstasf_la_SOURCES = gstasfmux.c gstasfdemux.c
+libgstasf_la_CFLAGS = $(GST_CFLAGS)
+libgstasf_la_LIBADD =
+libgstasf_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 
 noinst_HEADERS = gstasfdemux.h asfheaders.h gstasfmux.h
diff --git a/gst/asfdemux/gstasfdemux.c b/gst/asfdemux/gstasfdemux.c
index 578c90bf05..1259e66887 100644
--- a/gst/asfdemux/gstasfdemux.c
+++ b/gst/asfdemux/gstasfdemux.c
@@ -23,6 +23,7 @@
 #endif
 #include <gst/riff/riff-ids.h>
 #include "gstasfdemux.h"
+#include "gstasfmux.h" /* for the type registering */
 #include "asfheaders.h"
 
 /* elementfactory information */
@@ -1627,7 +1628,8 @@ plugin_init (GstPlugin *plugin)
     return FALSE;
 
   /* create an elementfactory for the asf_demux element */
-  if (!gst_element_register (plugin, "asfdemux", GST_RANK_PRIMARY, GST_TYPE_ASF_DEMUX))
+  if (!gst_element_register (plugin, "asfdemux", GST_RANK_PRIMARY, GST_TYPE_ASF_DEMUX) ||
+      !gst_element_register (plugin, "asfmux", GST_RANK_NONE, GST_TYPE_ASFMUX))
     return FALSE;
 
   return TRUE;
@@ -1636,8 +1638,8 @@ plugin_init (GstPlugin *plugin)
 GST_PLUGIN_DEFINE (
   GST_VERSION_MAJOR,
   GST_VERSION_MINOR,
-  "asfdemux",
-  "Demuxes ASF streams",
+  "asf",
+  "Demuxes and muxes audio and video in Microsofts ASF format",
   plugin_init,
   VERSION,
   "LGPL",
diff --git a/gst/asfdemux/gstasfmux.c b/gst/asfdemux/gstasfmux.c
index b95d160c5d..6d70568da9 100644
--- a/gst/asfdemux/gstasfmux.c
+++ b/gst/asfdemux/gstasfmux.c
@@ -1382,22 +1382,3 @@ gst_asfmux_change_state (GstElement *element)
   return GST_STATE_SUCCESS;
 }
 
-static gboolean
-plugin_init (GstPlugin *plugin)
-{
-  if (!gst_element_register (plugin, "asfmux", GST_RANK_NONE, GST_TYPE_ASFMUX))
-    return FALSE;
-  
-  return TRUE;
-}
-
-GST_PLUGIN_DEFINE (
-  GST_VERSION_MAJOR,
-  GST_VERSION_MINOR,
-  "asfmux",
-  "Muxes audio and video into an ASF stream",
-  plugin_init,
-  VERSION,
-  "LGPL",
-  GST_PACKAGE,
-  GST_ORIGIN)