diff --git a/build/build.xml b/build/build.xml
index 7d5d73acd..dabc54564 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -26,9 +26,9 @@
 
     <!-- Smack Version -->
     <property name="version.major" value="3" />
-    <property name="version.minor" value="3" />
-    <property name="version.revision" value="1" />
-    <property name="version.extra" value="" />
+    <property name="version.minor" value="4" />
+    <property name="version.revision" value="0" />
+    <property name="version.extra" value="SNAPSHOT" />
 	
     <if>
         <equals arg1="${version.extra}" arg2=""/>
@@ -42,7 +42,7 @@
             <property name="version"
                       value="${version.major}.${version.minor}.${version.revision}.${version.extra}"/>
             <property name="version.filename"
-                      value="${version.major}_${version.minor}_${version.revision}_${version.extra}"/>
+                      value="${version.major}.${version.minor}.${version.revision}.${version.extra}"/>
         </else>
     </if>
     <tstamp>
@@ -205,7 +205,7 @@
             </manifest>
         </jar>
     	
-    	<property name="debug.jar.name" value="${jar.dest.dir}/smack-debug.jar" />
+    	<property name="debug.jar.name" value="${jar.dest.dir}/smackx-debug.jar" />
 		<copy todir="${compile.dir}/images">
             <fileset dir="${basedir}/build/resources/images">
                 <include name="*.png"/>
@@ -225,7 +225,7 @@
             </manifest>
         </jar>
     	
-    	<property name="jingle.jar.name" value="${jar.dest.dir}/smack-jingle.jar" />
+    	<property name="jingle.jar.name" value="${jar.dest.dir}/smackx-jingle.jar" />
         <jar destfile="${jingle.jar.name}"
             basedir="${compile.dir}/jingle/extension"
             includes="org/jivesoftware/smackx/**/*.class">
diff --git a/build/release.xml b/build/release.xml
index 667b71d2f..745e917c7 100644
--- a/build/release.xml
+++ b/build/release.xml
@@ -32,26 +32,22 @@
             <equals arg1="${dailybuild}" arg2="true" />
             <then>
                 <tstamp>
-                    <format property="build.date" pattern="yyyy-MM-dd" locale="en"/>
+                    <format property="build.date" pattern="yyyyMMdd" locale="en"/>
                 </tstamp>
-                <property name="release.name" value="smack-${build.date}" />
-                <property name="release-dev.name" value="smack_src_${build.date}" />
+                <property name="release.name" value="smack-${version.filename}-${build.date}" />
             </then>
             <else>
-                <property name="release.name" value="smack_${version.filename}" />
-                <property name="release-dev.name" value="smack_src_${version.filename}" />
+                <property name="release.name" value="smack-${version.filename}" />
             </else>
         </if>
         <property name="release.dir" value="${basedir}/target/release/${release.name}" />
         <property name="release.samples.dir" value="${release.dir}/samples" />
-        <property name="release-dev.dir" value="${basedir}/target/release/${release-dev.name}" />
-        <property name="release-dev.samples.dir" value="${release-dev.name}/samples" />
-        <!-- create release dirs -->
+        
+    	<!-- create release dirs -->
         <mkdir dir="${release.dir}" />
         <mkdir dir="${release.samples.dir}" />
-        <mkdir dir="${release-dev.dir}" />
-        <mkdir dir="${release-dev.dir.samples}/samples" />
-        <!-- Copy smack.jar -->
+
+    	<!-- Copy smack.jar -->
         <copy todir="${release.dir}">
             <fileset dir="${jar.dest.dir}" includes="smack.jar" />
             <fileset dir="${jar.dest.dir}" includes="smackx.jar" />
@@ -62,78 +58,20 @@
             <fileset dir="${basedir}/build/resources/META-INF" includes="sample.providers" />
             <fileset dir="${basedir}/build/resources/META-INF" includes="smack-config.xml" />
         </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="smackx-jingle.jar" />
-        </copy>
-        <copy todir="${release-dev.samples.dir}">
-            <fileset dir="${basedir}/build/resources/META-INF" includes="sample.providers" />
-            <fileset dir="${basedir}/build/resources/META-INF" includes="smack-config" />
-        </copy>
-        <!-- Copy build dir -->
-        <copy todir="${release-dev.dir}/build">
-            <fileset dir="${basedir}/build">
-                <include name="ant*" />
-                <include name="junit.jar" />
-                <include name="build.xml" />
-                <include name="README.html" />
-                <include name="lib/*.jar" />
-                <include name="merge/*.jar" />
-                <include name="build/*.jar" />
-            </fileset>
-        </copy>
-		<copy todir="${release-dev.dir}/jingle/extension/build">
-            <fileset dir="${basedir}/jingle/extension/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 Javadocs -->
         <copy todir="${release.dir}/javadoc">
             <fileset dir="${basedir}/target/javadoc" includes="**/*.*" />
         </copy>
-        <copy todir="${release-dev.dir}/javadoc">
-            <fileset dir="${basedir}/target/javadoc" includes="**/*.*" />
-        </copy>
-        <!-- Copy documentation -->
+
+    	<!-- Copy documentation -->
         <copy todir="${release.dir}/documentation">
             <fileset dir="${basedir}/documentation" includes="**/*.*" />
         </copy>
-        <copy todir="${release-dev.dir}/documentation">
-            <fileset dir="${basedir}/documentation" includes="**/*.*" />
-        </copy>
-        <!-- Copy source -->
-        <copy todir="${release-dev.dir}/source">
-            <fileset dir="${basedir}/source" includes="**/*.java" />
-            <fileset dir="${basedir}/source" includes="**/*.html" />
-        </copy>
-        <copy todir="${release-dev.dir}/jingle/extension/source"> 
-		    <fileset dir="${basedir}/jingle/extension/source" includes="**/*.java" />
-            <fileset dir="${basedir}/jingle/extension/source" includes="**/*.html" />			
-        </copy>
-        <copy todir="${release-dev.dir}/test">
-            <fileset dir="${basedir}/test" includes="**/*.java" />
-        </copy>
-        <!-- Copy resources -->
-        <copy todir="${release-dev.dir}/build/resources">
-            <fileset dir="${basedir}/build/resources" includes="META-INF/core.providers" />
-            <fileset dir="${basedir}/build/resources" includes="META-INF/extension.providers" />
-            <fileset dir="${basedir}/build/resources" includes="META-INF/sample.providers" />
-            <fileset dir="${basedir}/build/resources" includes="META-INF/jul.properties" />
-            <fileset dir="${basedir}/build/resources" includes="META-INF/smack-config.xml" />
-        </copy>
-        <copy todir="${release-dev.dir}/build/resources/images">
-            <fileset dir="${basedir}/build/resources/images">
-                <include name="*.png"/>
-            </fileset>
-        </copy>
-        <!-- Copy readme.html and changelog.html -->
+
+
+    	<!-- Copy readme.html and changelog.html -->
         <copy todir="${release.dir}">
             <fileset dir="${basedir}/build/resources/releasedocs" includes="*.html" />
             <filterset>
@@ -141,57 +79,22 @@
                 <filter token="version" value="${version}"/>
             </filterset>
         </copy>
-        <copy todir="${release-dev.dir}">
-            <fileset dir="${basedir}/build/resources/releasedocs" includes="*.html" />
-            <filterset>
-                <filter token="builddate" value="${builddate}"/>
-                <filter token="version" value="${version}"/>
-            </filterset>
-        </copy>
-        <!-- Package -->
-        <if>
-            <equals arg1="${dailybuild}" arg2="true" />
-            <then>
-                <zip destfile="${basedir}/target/release/${release-dev.name}.zip"
-                    basedir="${release-dev.dir}/.."
-                    includes="${release-dev.name}/**/*.*"
-                />
-                <tar destfile="${basedir}/target/release/${release-dev.name}.tar.gz"
-                    basedir="${release-dev.dir}/.."
-                    includes="${release-dev.name}/**/*.*"
-                    compression="gzip"
-                />
-            </then>
-            <else>
-                <zip destfile="${basedir}/target/release/${release.name}.zip"
-                    basedir="${release.dir}/.."
-                    includes="${release.name}/**/*.*"
-                />
-                <tar destfile="${basedir}/target/release/${release.name}.tar.gz"
-                    basedir="${release.dir}/.."
-                    includes="${release.name}/**/*.*"
-                    compression="gzip"
-                />
-                <zip destfile="${basedir}/target/release/${release-dev.name}.zip"
-                    basedir="${release-dev.dir}/.."
-                    includes="${release-dev.name}/**/*.*"
-                />
-                <tar destfile="${basedir}/target/release/${release-dev.name}.tar.gz"
-                    basedir="${release-dev.dir}/.."
-                    includes="${release-dev.name}/**/*.*"
-                    compression="gzip"
-                />
-            </else>
-        </if>
 
+    	<!-- Package -->
+        <zip destfile="${basedir}/target/release/${release.name}.zip"
+            basedir="${release.dir}/.."
+            includes="${release.name}/**/*.*"
+        />
+        <tar destfile="${basedir}/target/release/${release.name}.tar.gz"
+            basedir="${release.dir}/.."
+            includes="${release.name}/**/*.*"
+            compression="gzip"
+        />
         <echo>
 -----------------------------------------------
-Release made, testing Ant targets of release...
+Release made
 -----------------------------------------------
         </echo>
-
-        <!-- call the release tester -->
-        <antcall target="test" />
     </target>
 
     <!-- test -->