diff --git a/build/build.xml b/build/build.xml
index a26bc0b5f..0905c0ff3 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -58,6 +58,7 @@
     <property name="test.dir" value="${basedir}/test" />
     <property name="resources.dir" value="${basedir}/build/resources" />
 	<property name="jingle.extension.merge.lib.dir" value="${basedir}/jingle/extension/build/merge" />	
+	<property name="jingle.extension.lib.dir" value="${basedir}/jingle/extension/build/lib" />	
 
     <!-- Test props - override these defaults in the properties file or in command line -->
     <property name="test.host" value="localhost" />
@@ -117,35 +118,18 @@
         >
             <src path="${basedir}/jingle/extension/source" />
             <classpath>
-                <fileset dir="${merge.lib.dir}">
+				<fileset dir="${merge.lib.dir}">
                     <include name="*.jar"/>
                 </fileset>
-				<fileset dir="${basedir}/jingle/extension/build/merge">
+                <fileset dir="${jingle.extension.lib.dir}">
+                    <include name="*.jar"/>
+                </fileset>
+				<fileset dir="${jingle.extension.merge.lib.dir}">
                     <include name="*.jar"/>
                 </fileset>
 				<pathelement path="${compile.dir}"/>
             </classpath>
         </javac>		
-		<mkdir dir="${compile.dir}/jingle/media" />
-		<javac
-            destdir="${compile.dir}/jingle/media"
-            includeAntRuntime="no"
-            debug="on"
-            source="1.5"
-            target="1.5"
-        >
-            <src path="${basedir}/jingle/media/source" />
-            <classpath>
-                <fileset dir="${merge.lib.dir}">
-                    <include name="*.jar"/>
-                </fileset>
-				<fileset dir="${basedir}/jingle/media/build/lib">
-                    <include name="*.jar"/>
-                </fileset>
-				<pathelement path="${compile.dir}"/>
-				<pathelement path="${compile.dir}/jingle/extension"/>
-            </classpath>
-        </javac>				
     </target>
 
     <!-- compile-test -->
@@ -216,14 +200,6 @@
                 <attribute name="Class-Path" value="smack.jar, smackx.jar" />
             </manifest>
             <zipfileset src="${jingle.extension.merge.lib.dir}/jstun.jar"/>
-        </jar>
-		<jar destfile="${jar.dest.dir}/smackx-jingleMedia.jar"
-            basedir="${compile.dir}/jingle/media"
-            includes="org/jivesoftware/**/*.class"
-        >
-            <manifest>
-                <attribute name="Class-Path" value="smack.jar,smackx.jar,smackx-jingle.jar" />
-            </manifest>
         </jar>
         <delete file="${compile.dir}/META-INF/smack-config.xml" />
         <delete file="${compile.dir}/META-INF/smack.providers" />
@@ -382,7 +358,6 @@
         <delete file="${basedir}/smackx-debug.jar" />
         <delete file="${basedir}/smack-test.jar" />
 		<delete file="${basedir}/smackx-jingle.jar" />
-		<delete file="${basedir}/smackx-jingleMedia.jar" />
         <delete dir="${basedir}/target" />
     </target>
 
diff --git a/build/projects/Smack.ipr b/build/projects/Smack.ipr
index e57563f97..6dc40be2a 100644
--- a/build/projects/Smack.ipr
+++ b/build/projects/Smack.ipr
@@ -285,7 +285,6 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/../../jingle/extension/build/projects/JingleExtension.iml" filepath="$PROJECT_DIR$/../../jingle/extension/build/projects/JingleExtension.iml" />
-      <module fileurl="file://$PROJECT_DIR$/../../jingle/media/build/projects/JingleMedia.iml" filepath="$PROJECT_DIR$/../../jingle/media/build/projects/JingleMedia.iml" />
       <module fileurl="file://$PROJECT_DIR$/Smack.iml" filepath="$PROJECT_DIR$/Smack.iml" />
     </modules>
   </component>
diff --git a/build/release.xml b/build/release.xml
index d4ca152a1..6a1c2e907 100644
--- a/build/release.xml
+++ b/build/release.xml
@@ -53,14 +53,12 @@
             <fileset dir="${jar.dest.dir}" includes="smackx.jar" />
             <fileset dir="${jar.dest.dir}" includes="smackx-debug.jar" />
 			<fileset dir="${jar.dest.dir}" includes="jingleExtension.jar" />
-			<fileset dir="${jar.dest.dir}" includes="jingleMedia.jar" />
         </copy>
         <copy todir="${release-dev.dir}">
             <fileset dir="${jar.dest.dir}" includes="smack.jar" />
             <fileset dir="${jar.dest.dir}" includes="smackx.jar" />
             <fileset dir="${jar.dest.dir}" includes="smackx-debug.jar" />
 			<fileset dir="${jar.dest.dir}" includes="jingleExtension.jar" />
-			<fileset dir="${jar.dest.dir}" includes="jingleMedia.jar" />			
         </copy>
         <!-- Copy build dir -->
         <copy todir="${release-dev.dir}/build">
@@ -82,16 +80,6 @@
                 <include name="lib/*.jar" />
                 <include name="merge/*.jar" />
             </fileset>
-        </copy>
-		<copy todir="${release-dev.dir}/jingle/media/build">
-            <fileset dir="${basedir}/jingle/media/build">
-                <include name="ant*" />
-                <include name="junit.jar" />
-                <include name="build.xml" />
-                <include name="README.html" />
-                <include name="lib/*.jar" />
-                <include name="merge/*.jar" />
-            </fileset>
         </copy>
         <!-- Copy Javadocs -->
         <copy todir="${release.dir}/javadoc">
@@ -116,10 +104,6 @@
 		    <fileset dir="${basedir}/jingle/extension/source" includes="**/*.java" />
             <fileset dir="${basedir}/jingle/extension/source" includes="**/*.html" />			
         </copy>
-		<copy todir="${release-dev.dir}/jingle/media/source">
-            <fileset dir="${basedir}/jingle/media/source" includes="**/*.java" />
-            <fileset dir="${basedir}/jingle/media/source" includes="**/*.html" />						
-		</copy>
         <copy todir="${release-dev.dir}/test">
             <fileset dir="${basedir}/test" includes="**/*.java" />
         </copy>