--- a/configure.ac
+++ b/configure.ac
@@ -682,7 +682,7 @@ dnl *** vorbis ***
 dnl AM_PATH_VORBIS only takes two options
 translit(dnm, m, l) AM_CONDITIONAL(USE_VORBIS, true)
 AG_GST_CHECK_FEATURE(VORBIS, [Xiph Vorbis audio codec], vorbis, [
-  AG_GST_PKG_CHECK_MODULES(VORBIS, vorbis >= 1.0 vorbisenc >= 1.0)
+  AG_GST_PKG_CHECK_MODULES(VORBIS, vorbis >= 1.0)
   if test $HAVE_VORBIS = no
   then
     XIPH_PATH_VORBIS(HAVE_VORBIS="yes", HAVE_VORBIS="no")
--- a/ext/vorbis/Makefile.am
+++ b/ext/vorbis/Makefile.am
@@ -6,9 +6,7 @@ plugin_LTLIBRARIES += libgstvorbis.la
 libgstvorbis_la_SOURCES = gstvorbis.c \
 			  gstvorbisdec.c \
 			  gstvorbisdeclib.c \
-			  gstvorbisenc.c \
 			  gstvorbisparse.c \
-			  gstvorbistag.c \
 			  gstvorbiscommon.c
 
 libgstvorbis_la_CFLAGS = \
@@ -18,7 +16,7 @@ libgstvorbis_la_LIBADD = \
 	$(top_builddir)/gst-libs/gst/tag/libgsttag-@GST_API_VERSION@.la \
 	$(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_API_VERSION@.la \
 	$(GST_LIBS) \
-	$(VORBIS_LIBS) $(VORBISENC_LIBS)
+	$(VORBIS_LIBS)
 libgstvorbis_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstvorbis_la_LIBTOOLFLAGS = --tag=disable-static
 endif
--- a/ext/vorbis/gstvorbis.c
+++ b/ext/vorbis/gstvorbis.c
@@ -23,23 +23,15 @@
 
 #include "gst/tag/tag.h"
 
-#include "gstvorbisenc.h"
 #include "gstvorbisdec.h"
 #include "gstvorbisparse.h"
-#include "gstvorbistag.h"
 
-GST_DEBUG_CATEGORY (vorbisenc_debug);
 GST_DEBUG_CATEGORY (vorbisdec_debug);
 GST_DEBUG_CATEGORY (vorbisparse_debug);
-GST_DEBUG_CATEGORY (vorbistag_debug);
 
 static gboolean
 plugin_init (GstPlugin * plugin)
 {
-  if (!gst_element_register (plugin, "vorbisenc", GST_RANK_PRIMARY,
-          GST_TYPE_VORBISENC))
-    return FALSE;
-
   if (!gst_element_register (plugin, "vorbisdec", GST_RANK_PRIMARY,
           gst_vorbis_dec_get_type ()))
     return FALSE;
@@ -48,18 +40,10 @@ plugin_init (GstPlugin * plugin)
           gst_vorbis_parse_get_type ()))
     return FALSE;
 
-  if (!gst_element_register (plugin, "vorbistag", GST_RANK_NONE,
-          gst_vorbis_tag_get_type ()))
-    return FALSE;
-
-  GST_DEBUG_CATEGORY_INIT (vorbisenc_debug, "vorbisenc", 0,
-      "vorbis encoding element");
   GST_DEBUG_CATEGORY_INIT (vorbisdec_debug, "vorbisdec", 0,
       "vorbis decoding element");
   GST_DEBUG_CATEGORY_INIT (vorbisparse_debug, "vorbisparse", 0,
       "vorbis parsing element");
-  GST_DEBUG_CATEGORY_INIT (vorbistag_debug, "vorbistag", 0,
-      "vorbis tagging element");
 
   gst_tag_register_musicbrainz_tags ();