diff --git a/addon/yacyInit.m4 b/addon/yacyInit.m4
index c866781f7..cd53d5d25 100644
--- a/addon/yacyInit.m4
+++ b/addon/yacyInit.m4
@@ -57,7 +57,8 @@ SHUTDOWN_TIMEOUT=50
 # Default niceness if not set in config file
 NICE_VAL=0
 
-JAVA_ARGS="-server -XX:MaxPermSize=256m -XX:+UseConcMarkSweepGC -XX:+CMSIncrementalMode -XX:-UseGCOverheadLimit -XX:+UseAdaptiveSizePolicy -Djava.net.preferIPv4Stack=true -Djava.awt.headless=true -Dfile.encoding=UTF-8"
+JAVA_ARGS="-server -Djava.net.preferIPv4Stack=true -Djava.awt.headless=true -Dfile.encoding=UTF-8"
+
 #check if system supports large memory pages and enable it if possible
 HUGEPAGESTOTAL="$(cat /proc/meminfo | grep HugePages_Total | sed s/[^0-9]//g)"
 if [ -n "$HUGEPAGESTOTAL" ] && [ $HUGEPAGESTOTAL -ne 0 ]
@@ -65,6 +66,9 @@ then
   JAVA_ARGS="$JAVA_ARGS -XX:+UseLargePages"
 fi
 
+#turn on MMap for Solr if OS is a 64bit OS
+if [ -n "`uname -m | grep 64`" ]; then JAVA_ARGS="$JAVA_ARGS -d64 -Dsolr.directoryFactory=solr.MMapDirectoryFactory"; fi
+
 ifdef(`openSUSE', `dnl
 . /etc/rc.status
 rc_reset