diff --git a/addon/yacyInit.m4 b/addon/yacyInit.m4
index 630f44ae0..be61e0b4c 100644
--- a/addon/yacyInit.m4
+++ b/addon/yacyInit.m4
@@ -46,6 +46,8 @@ SHUTDOWN_TIMEOUT=50
 # Default niceness if not set in config file
 NICE_VAL=0
 
+JAVA_ARGS="-server -XX:+UseConcMarkSweepGC -XX:+CMSIncrementalMode -XX:+UseAdaptiveSizePolicy"
+
 ifdef(`openSUSE', `dnl
 . /etc/rc.status
 rc_reset
@@ -80,7 +82,7 @@ fi
 
 cd $YACY_HOME
 
-JAVA_ARGS="-Djava.awt.headless=true"
+JAVA_ARGS="$JAVA_ARGS -Djava.awt.headless=true"
 #get javastart args
 if [ -f DATA/SETTINGS/yacy.conf ]
 then
@@ -97,6 +99,8 @@ then
 		if [ -n $j ]; then NICE_VAL=$j; fi;
 	fi
 	
+else
+	JAVA_ARGS="-Xmx=120m -Xms120m $JAVA_ARGS"
 fi
 
 # generating the proper classpath
diff --git a/build.xml b/build.xml
index 0864b6b35..01a5be076 100644
--- a/build.xml
+++ b/build.xml
@@ -752,7 +752,10 @@
     </delete>
   </target>
 
-  <target name="installonlinux" depends="compileMain,build-jar">
+  <target name="installonlinux">
+    <!-- check for jar-file -->
+    <available file="yacy.jar" property="built"/>
+    <fail message="Please build yacy with 'ant clean all'" unless="built"/>
     <!-- copy main class files -->
     <copy todir="${DESTDIR}/usr/share/java/">
       <fileset dir=".">
@@ -980,8 +983,7 @@
     <ant2svg destfile="doc/build_dependencies.svg"/>
   </target>
 
-  <target name="build-jar" depends="compileMain">
-    <delete file="yacy.jar" />
+  <target name="build-jar" depends="compileMain,compileExtensions">
     <jar destfile="yacy.jar" basedir="${build}/">
       <manifest>
         <attribute name="Main-Class" value="yacy"/>
@@ -989,7 +991,7 @@
     </jar>
   </target>
 
-  <target name="makeWinStartExe" depends="build-jar,compileExtensions">
+  <target name="makeWinStartExe" depends="build-jar">
     <!-- Creates a Windows Executable using JSmooth (http://jsmooth.sf.net) -->
     <taskdef name="jsmoothgen"
              classname="net.charabia.jsmoothgen.ant.JSmoothGen"
@@ -1066,6 +1068,7 @@
     <exec executable="dpkg-buildpackage">
       <arg value="-b"/>
       <arg value="-rfakeroot"/>
+      <arg value="-uc"/>
     </exec>
     <replaceregexp file="debian/changelog"
                   match="yacy \(.*\) unstable; urgency=low"
diff --git a/debian/rules b/debian/rules
index 5e6241813..bff263b66 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,7 +18,8 @@ configure-stamp:
 build: build-stamp
 
 build-stamp: configure-stamp 
-	ant all
+	# build yacy
+	ant build-jar
 	m4 -DDebian addon/yacyInit.m4 >debian/yacy.init
 
 clean:
@@ -26,7 +27,7 @@ clean:
 	rm -f debian/yacy.init
 	dh_clean 
 
-install: build
+install:
 	# Add here commands to install the package into debian/yacy.
 	ant installonlinux -DDESTDIR=$(CURDIR)/debian/yacy
 	mkdir -p $(CURDIR)/debian/yacy/usr/share/java/yacy/
@@ -36,11 +37,11 @@ install: build
 
 
 # Build architecture-independent files here.
-binary-indep: build install
+binary-indep: install
 # We have nothing to do by default.
 
 # Build architecture-dependent files here.
-binary-arch: build install
+binary-arch: install
 	dh_installchangelogs 
 	dh_installdocs
 	dh_installinit