diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 6f9ed3e0978..115a69f77c7 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -92,6 +92,8 @@
 #include "BLI_arithb.h"
 #include "BLI_blenlib.h"
 
+#include "FRS_freestyle_config.h"
+
 //XXX #include "nla.h"
 
 #ifdef WIN32
@@ -824,6 +826,7 @@ void scene_add_render_layer(Scene *sce)
 	srl->lay= (1<<20) -1;
 	srl->layflag= 0x7FFF;	/* solid ztra halo edge strand */
 	srl->passflag= SCE_PASS_COMBINED|SCE_PASS_Z;
+	FRS_add_freestyle_config( srl );
 }
 
 /* render simplification */
diff --git a/source/blender/render/CMakeLists.txt b/source/blender/render/CMakeLists.txt
index 3284f7ea79a..894b38fbcda 100644
--- a/source/blender/render/CMakeLists.txt
+++ b/source/blender/render/CMakeLists.txt
@@ -29,7 +29,7 @@ FILE(GLOB SRC intern/source/*.c)
 SET(INC 
 	intern/include ../../../intern/guardedalloc ../blenlib ../makesdna
 	extern/include ../blenkernel ../imbuf
-	../include ../../kernel/gen_messaging ../blenloader
+	../include ../../kernel/gen_messaging ../blenloader ../freestyle
 	../../../intern/smoke/extern
 	../makesrna
 )
diff --git a/source/blender/render/SConscript b/source/blender/render/SConscript
index db151775b96..feeaeb8c75b 100644
--- a/source/blender/render/SConscript
+++ b/source/blender/render/SConscript
@@ -6,7 +6,7 @@ sources = env.Glob('intern/source/*.c')
 
 incs = 'intern/include #/intern/guardedalloc ../blenlib ../makesdna ../makesrna'
 incs += ' extern/include ../blenkernel ../radiosity/extern/include ../imbuf'
-incs += ' ../include ../blenloader ../../../intern/smoke/extern'
+incs += ' ../include ../blenloader ../freestyle ../../../intern/smoke/extern'
 
 defs = []
 
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index 8ef52991ca2..9234e72df9c 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -66,6 +66,9 @@
 
 #include "RE_pipeline.h"
 
+#include "FRS_freestyle.h"
+#include "FRS_freestyle_config.h"
+
 /* internal */
 #include "render_types.h"
 #include "renderpipeline.h"
@@ -596,6 +599,7 @@ static RenderResult *new_render_result(Render *re, rcti *partrct, int crop, int
 		rl->lay= (1<<20) -1;
 		rl->layflag= 0x7FFF;	/* solid ztra halo strand */
 		rl->passflag= SCE_PASS_COMBINED;
+		FRS_add_freestyle_config( srl );
 		
 		re->r.actlay= 0;
 	}
@@ -1709,6 +1713,10 @@ static void do_render_3d(Render *re)
 		if(!re->test_break(re->tbh))
 			add_halo_flare(re);
 	
+	/* Freestyle  */
+	if( re->r.mode & R_EDGE_FRS && re->r.renderer==R_INTERN)
+		FRS_add_Freestyle(re);
+		
 	/* free all render verts etc */
 	RE_Database_Free(re);
 }