diff --git a/eeschema/plugins/makefile.gtk b/eeschema/plugins/makefile.gtk
index feebba028e..0a3a71cdcb 100644
--- a/eeschema/plugins/makefile.gtk
+++ b/eeschema/plugins/makefile.gtk
@@ -1,18 +1,8 @@
 # File:		makefile for eeschema, mingw
 
-#used only to define (KICAD_BIN) :
+#used only to define (KICAD_BIN) and (LIBSTDC) :
 include ../../libs.linux
 
-# Use static link for libsupc++ (locate libstdc++.a and copy it in kicad_dev/syslibs)
-ifeq ($(KICAD_STATIC_LINK), 1)
-#define path for a copy of libstdc++.a or/and libsupc++.a:
-LIBSTDC = ../../syslibs/libstdc++.a
-else
-# Or Use static link for libsupc++ or libstdc++
-LIBSTDC = -lstdc++
-endif
-
-
 all: netlist_form_pads-pcb
 
 deps:
diff --git a/freeroute.jnlp b/freeroute.jnlp
index c857a05ef2..2e9ba96706 100644
--- a/freeroute.jnlp
+++ b/freeroute.jnlp
@@ -15,11 +15,9 @@
    <resources>     
    	<jar download="eager" href="router.jar"/>   
       <extension href="help.jnlp" name="Java Help"/>
-	<java version="1.6+"/>
+	<java version="1.6+" java-vm-args="-Xmx1024m"/>
    </resources>
    <application-desc main-class="gui.MainApplication">
       <argument>-webstart</argument> 
-      <argument>-Xincgc</argument>
-      <argument>-Xmx512m</argument>
    </application-desc>
 </jnlp>
\ No newline at end of file
diff --git a/pcbnew/makefile.gtk b/pcbnew/makefile.gtk
index 9ed26d9e1b..ade48fd3f3 100644
--- a/pcbnew/makefile.gtk
+++ b/pcbnew/makefile.gtk
@@ -3,11 +3,10 @@
 
 include ../libs.linux
 
-BOOST_LIB = /usr/include/boost
+BOOST_LIB = ../
 
 # Additional compiler flags
-CPPFLAGS +=
-
+CPPFLAGS += -I $(BOOST_LIB)
 
 TARGET = pcbnew
 
@@ -20,7 +19,7 @@ include makefile.include
 -include *.d
 
 CPPFLAGS += $(EXTRACPPFLAGS)
-EDACPPFLAGS = $(CPPFLAGS)
+EDACPPFLAGS = $(CPPFLAGS)  $(BOOST_LIB)
 
 
 $(TARGET): $(OBJECTS) makefile.gtk  makefile.include $(LIBVIEWER3D) $(EXTRALIBS) ../libs.linux