diff --git a/ChangeLog b/ChangeLog
index 6fc3959b174..d67122c2dd6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-02-18  David Schleef  <ds@schleef.org>
+
+	* configure.ac:  Move massink to gst-rotten
+	* ext/Makefile.am:
+	* ext/mas/Makefile.am:
+	* ext/mas/massink.c:
+	* ext/mas/massink.h:
+
 2004-02-18  David Schleef  <ds@schleef.org>
 
 	* ext/gdk_pixbuf/gstgdkpixbuf.c: (plugin_init): Disable gdk_pixbuf
diff --git a/configure.ac b/configure.ac
index 0989d99de19..3626b82b0db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -811,15 +811,6 @@ GST_CHECK_FEATURE(DVDNAV, [dvdnav library], dvdnavsrc, [
   AS_SCRUB_INCLUDE(DVDNAV_CFLAGS)
 ])
 
-dnl *** MAS ***
-translit(dnm, m, l) AM_CONDITIONAL(USE_MAS, true)
-GST_CHECK_FEATURE(MAS, [mas library], massink, [
-  translit(dnm, m, l) AC_SUBST(MAS_LIBS)
-  translit(dnm, m, l) AC_SUBST(MAS_CFLAGS)
-  GST_CHECK_CONFIGPROG(MAS, mas-config)
-  AS_SCRUB_INCLUDE(MAS_CFLAGS)
-])
-
 dnl **** ESound ****
 translit(dnm, m, l) AM_CONDITIONAL(USE_ESD, true)
 GST_CHECK_FEATURE(ESD, [esound plug-ins], esdsink esdmon, [
@@ -1652,7 +1643,6 @@ ext/libfame/Makefile
 ext/libpng/Makefile
 ext/librfb/Makefile
 ext/mad/Makefile
-ext/mas/Makefile
 ext/mikmod/Makefile
 ext/mpeg2dec/Makefile
 ext/mpeg2enc/Makefile
diff --git a/ext/Makefile.am b/ext/Makefile.am
index 8bb401dd38d..4865588c0c0 100644
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -64,12 +64,6 @@ else
 ESD_DIR=
 endif
 
-if USE_MAS
-MAS_DIR=mas
-else
-MAS_DIR=
-endif
-
 if USE_FAAC
 FAAC_DIR=faac
 else
@@ -347,7 +341,6 @@ SUBDIRS=\
 	$(LIBPNG_DIR) \
 	$(LIBRFB_DIR) \
 	$(MAD_DIR) \
-	$(MAS_DIR) \
 	$(MIKMOD_DIR) \
 	$(MPEG2DEC_DIR) \
 	$(MPEG2ENC_DIR) \
@@ -401,7 +394,6 @@ DIST_SUBDIRS=\
 	libpng \
 	librfb \
 	mad \
-	mas \
 	mikmod \
 	mpeg2dec \
 	mpeg2enc \