diff --git a/addon/jsmooth/lib/jsmoothgen-ant.jar b/addon/jsmooth/lib/jsmoothgen-ant.jar
new file mode 100644
index 000000000..0ad825e8e
Binary files /dev/null and b/addon/jsmooth/lib/jsmoothgen-ant.jar differ
diff --git a/addon/jsmooth/skeletons/console-wrapper/consolewrapper.exe b/addon/jsmooth/skeletons/console-wrapper/consolewrapper.exe
new file mode 100644
index 000000000..98e010e76
Binary files /dev/null and b/addon/jsmooth/skeletons/console-wrapper/consolewrapper.exe differ
diff --git a/addon/jsmooth/skeletons/console-wrapper/description.skel b/addon/jsmooth/skeletons/console-wrapper/description.skel
new file mode 100644
index 000000000..8f29ec1a0
--- /dev/null
+++ b/addon/jsmooth/skeletons/console-wrapper/description.skel
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<jsmoothskeleton>
+<debug>false</debug>
+<description>This skeleton wraps console applications. 
+- Standard Input/Output and Error streams are available
+- If no Java VM is found, it displays a default message.
+
+Although it is designed for console application (i.e. launched from the command.com shell prompt), it can launch standard GUI application. In such a case, any output of the java application (from System.out or System.err) is displayed in the a DOS Console.
+</description>
+<executableName>consolewrapper.exe</executableName>
+<resourceCategory>JAVA</resourceCategory>
+<resourceJarId>102</resourceJarId>
+<resourcePropsId>103</resourcePropsId>
+<shortName>Console Wrapper</shortName>
+<skeletonProperties>
+<description>When no JVM is found in the target computer, the following message is displayed on the console.</description>
+<idName>Message</idName>
+<label>Message</label>
+<type>textarea</type>
+<value>This program needs Java to run.
+Please download it at http://www.java.com</value>
+</skeletonProperties>
+<skeletonProperties>
+<description>The wrapper waits a keypress on the console when the application exits.</description>
+<idName>PressKey</idName>
+<label>PressKey</label>
+<type>boolean</type>
+<value>0</value>
+</skeletonProperties>
+<skeletonProperties>
+<description>Enable the jsmooth debug traces</description>
+<idName>Debug</idName>
+<label>Debug traces</label>
+<type>boolean</type>
+<value>0</value>
+</skeletonProperties>
+</jsmoothskeleton>
diff --git a/addon/jsmooth/skeletons/windowed-wrapper/description.skel b/addon/jsmooth/skeletons/windowed-wrapper/description.skel
new file mode 100644
index 000000000..a1ef9cd1e
--- /dev/null
+++ b/addon/jsmooth/skeletons/windowed-wrapper/description.skel
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<jsmoothskeleton>
+<debug>false</debug>
+<description>This skeleton wraps GUI applications. 
+- No console I/O is displayed
+- If no Java VM is found, it is able to display a configurable URL (typically to a java download page).
+</description>
+<executableName>jwrap.exe</executableName>
+<resourceCategory>JAVA</resourceCategory>
+<resourceJarId>102</resourceJarId>
+<resourcePropsId>103</resourcePropsId>
+<shortName>Windowed Wrapper</shortName>
+<skeletonProperties>
+<description>When no JVM is found in the target computer, the user is prompted with the message defined below. Then, the default browser is launched with the URL defined here.</description>
+<idName>Message</idName>
+<label>Message</label>
+<type>textarea</type>
+<value>Java has not been found on your computer. Do you want to download it?</value>
+</skeletonProperties>
+<skeletonProperties>
+<description>If the user selects YES to the message prompted above, the default web browser is launched with this URL.</description>
+<idName>URL</idName>
+<label>URL</label>
+<type>string</type>
+<value>http://www.java.com</value>
+</skeletonProperties>
+<skeletonProperties>
+<description>The default behaviour is to launch the java application in a different (detached)  process. If you want to force the wrapper to launch the Java application in the same process than the exe, than select this option.</description>
+<idName>SingleProcess</idName>
+<label>Launch java app in the exe process</label>
+<type>boolean</type>
+<value>0</value>
+</skeletonProperties>
+<skeletonProperties>
+<description>Enable the jsmooth debug console.</description>
+<idName>Debug</idName>
+<label>Debug console</label>
+<type>boolean</type>
+<value>0</value>
+</skeletonProperties>
+</jsmoothskeleton>
diff --git a/addon/jsmooth/skeletons/windowed-wrapper/jwrap.exe b/addon/jsmooth/skeletons/windowed-wrapper/jwrap.exe
new file mode 100644
index 000000000..38d1f3644
Binary files /dev/null and b/addon/jsmooth/skeletons/windowed-wrapper/jwrap.exe differ
diff --git a/addon/jsmooth/yacy.jsmooth b/addon/jsmooth/yacy.jsmooth
new file mode 100644
index 000000000..da3748e03
--- /dev/null
+++ b/addon/jsmooth/yacy.jsmooth
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<jsmoothproject>
+<JVMSearchPath>registry</JVMSearchPath>
+<JVMSearchPath>javahome</JVMSearchPath>
+<JVMSearchPath>jrepath</JVMSearchPath>
+<JVMSearchPath>jdkpath</JVMSearchPath>
+<JVMSearchPath>exepath</JVMSearchPath>
+<JVMSearchPath>jview</JVMSearchPath>
+<arguments></arguments>
+<classPath>..\..\htroot</classPath>
+<classPath>..\..\htroot\htdocsdefault</classPath>
+<classPath>..\..\htroot\proxymsg</classPath>
+<classPath>..\..\htroot\yacy</classPath>
+<classPath>..\..\yacy.jar</classPath>
+<classPath>..\..\lib\commons-collections.jar</classPath>
+<classPath>..\..\lib\commons-pool-1.2.jar</classPath>
+<classPath>..\..\libx\axis-ant.jar</classPath>
+<classPath>..\..\libx\axis.jar</classPath>
+<classPath>..\..\libx\bzip2.jar</classPath>
+<classPath>..\..\libx\commons-codec-1.3.jar</classPath>
+<classPath>..\..\libx\commons-discovery.jar</classPath>
+<classPath>..\..\libx\commons-logging.jar</classPath>
+<classPath>..\..\libx\informa-0.6.0.jar</classPath>
+<classPath>..\..\libx\jakarta-oro-2.0.7.jar</classPath>
+<classPath>..\..\libx\javasvn.jar</classPath>
+<classPath>..\..\libx\jaxrpc.jar</classPath>
+<classPath>..\..\libx\jdom.jar</classPath>
+<classPath>..\..\libx\jmimemagic-0.0.4a.jar</classPath>
+<classPath>..\..\libx\jrpm-head.jar</classPath>
+<classPath>..\..\libx\jrpm-SNAPSHOT.jar</classPath>
+<classPath>..\..\libx\jsch-0.1.21.jar</classPath>
+<classPath>..\..\libx\log4j-1.2.9.jar</classPath>
+<classPath>..\..\libx\odf_utils_05_11_10.jar</classPath>
+<classPath>..\..\libx\PDFBox-0.7.2.jar</classPath>
+<classPath>..\..\libx\saaj.jar</classPath>
+<classPath>..\..\libx\tar.jar</classPath>
+<classPath>..\..\libx\tm-extractors-0.4.jar</classPath>
+<classPath>..\..\libx\wsdl4j.jar</classPath>
+<classPath>..\..\libx\xerces.jar</classPath>
+<embeddedJar>false</embeddedJar>
+<executableName>..\..\yacy.exe</executableName>
+<iconLocation>..\..\htroot\favicon.png</iconLocation>
+<initialMemoryHeap>-1</initialMemoryHeap>
+<mainClassName>yacy</mainClassName>
+<maximumMemoryHeap>-1</maximumMemoryHeap>
+<maximumVersion></maximumVersion>
+<minimumVersion>1.4.2</minimumVersion>
+<skeletonName>Console Wrapper</skeletonName>
+<skeletonProperties>
+<key>Message</key>
+<value>This program needs Java to run. Please download it at http://www.java.com</value>
+</skeletonProperties>
+<skeletonProperties>
+<key>PressKey</key>
+<value>1</value>
+</skeletonProperties>
+<skeletonProperties>
+<key>Debug</key>
+<value>0</value>
+</skeletonProperties>
+</jsmoothproject>
diff --git a/build.xml b/build.xml
index 93368aad3..32dc339f2 100644
--- a/build.xml
+++ b/build.xml
@@ -379,6 +379,7 @@
 	    <include name="stopYACY_Win9x.bat"/>
 	  </fileset>	
 	</copy>
+	<copy todir="${release_main}" file="yacy.exe" failonerror="false"/>
 	
 	<!-- copy locales  -->
 	<copy todir="${release_main}/locales">
@@ -616,7 +617,7 @@
   </jar>	
 </target>
 	
-<target name="win-exe" depends="build-jar">
+<target name="makeWinExe" depends="build-jar,compileExtensions">
   <!-- Creates a Windows Executable using JSmooth (http://jsmooth.sf.net) -->
   <taskdef name="jsmoothgen"
            classname="net.charabia.jsmoothgen.ant.JSmoothGen"
@@ -629,4 +630,7 @@
 	  </delete>	
 </target>	
 
+<target name="distWinExe" depends="makeWinExe,distAllInOne">	
+</target>
+
 </project>
diff --git a/doc/This_is_a_test_if_the_archive_file_containing_YaCy_was_unpacked_correctly_If_not_please_use_gnu_tar_instead.txt b/doc/This_is_a_test_if_the_archive_file_containing_YaCy_was_unpacked_correctly_If_not_please_use_gnu_tar_instead.txt
new file mode 100644
index 000000000..418cd6066
--- /dev/null
+++ b/doc/This_is_a_test_if_the_archive_file_containing_YaCy_was_unpacked_correctly_If_not_please_use_gnu_tar_instead.txt
@@ -0,0 +1,7 @@
+            // Testing if the yacy archive file were unzipped correctly.
+            // This test is needed because of classfile-names longer than 100 chars
+            // which could cause problems with incompatible unzip software.
+            // See:
+            // - http://www.yacy-forum.de/viewtopic.php?t=1763
+            // - http://www.yacy-forum.de/viewtopic.php?t=715
+            // - http://www.yacy-forum.de/viewtopic.php?t=1674
\ No newline at end of file
diff --git a/htroot/favicon.png b/htroot/favicon.png
new file mode 100644
index 000000000..c6f8e7826
Binary files /dev/null and b/htroot/favicon.png differ
diff --git a/source/yacy.java b/source/yacy.java
index 0901de4f2..4ed2351fe 100644
--- a/source/yacy.java
+++ b/source/yacy.java
@@ -234,7 +234,7 @@ public final class yacy {
             // - http://www.yacy-forum.de/viewtopic.php?t=1763
             // - http://www.yacy-forum.de/viewtopic.php?t=715
             // - http://www.yacy-forum.de/viewtopic.php?t=1674
-            File unzipTest = new File(homePath,"classes/de/anomic/kelondro/kelondroMScoreCluster$reverseScoreIterator.class");
+            File unzipTest = new File(homePath,"doc/This_is_a_test_if_the_archive_file_containing_YaCy_was_unpacked_correctly_If_not_please_use_gnu_tar_instead.txt");
             if (!unzipTest.exists()) {
                 String errorMsg = "The archive file containing YaCy was not unpacked correctly. " +
                                   "Please use 'GNU-Tar' or upgrade to a newer version of your unzip software.\n" +