diff --git a/.gitattributes b/.gitattributes
index 42dcec08737..03170ae3cf9 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -407,6 +407,7 @@ Circular_kernel_2/Benchmarks/parser/Report.pdf -text svneol=unset#application/pd
 Circular_kernel_2/Benchmarks/readme.doc -text svneol=unset#application/msword
 Circular_kernel_2/Benchmarks/readme.pdf -text svneol=unset#application/pdf
 Circular_kernel_2/Benchmarks/readme.sxw -text
+Circular_kernel_2/demo/Circular_kernel_2/README -text
 Circular_kernel_2/demo/Circular_kernel_2/demo.vcproj eol=crlf
 Circular_kernel_2/demo/Circular_kernel_2/help/get_arc.jpeg -text svneol=unset#image/jpeg
 Circular_kernel_2/demo/Circular_kernel_2/help/index.html svneol=native#text/html
diff --git a/Circular_kernel_2/demo/Circular_kernel_2/GNUmakefile b/Circular_kernel_2/demo/Circular_kernel_2/GNUmakefile
index 1175c258a6b..319608335eb 100644
--- a/Circular_kernel_2/demo/Circular_kernel_2/GNUmakefile
+++ b/Circular_kernel_2/demo/Circular_kernel_2/GNUmakefile
@@ -6,7 +6,7 @@
 #---------------------------------------------------------------------#
 # Choose the right include file from the <cgalroot>/make directory.
 
-CGAL_MAKEFILE=/user/teillaud/home/CGAL/install/CGAL-I/make/makefile_i686_Linux-2.6_g++-4.1.0
+# CGAL_MAKEFILE = ENTER_YOUR_INCLUDE_MAKEFILE_HERE
 include $(CGAL_MAKEFILE)
 
 #---------------------------------------------------------------------#
@@ -37,27 +37,11 @@ LDFLAGS = \
 #---------------------------------------------------------------------#
 
 all:            \
-                demo$(EXE_EXT) \
-		demo_viewer$(EXE_EXT)\
-		demo_line$(EXE_EXT) \
-		demo_line_circle$(EXE_EXT)#\
-#		demo_Lazy_line_circle$(EXE_EXT)
+                demo$(EXE_EXT) 
 
 demo.moc: demo.cpp
 	${QT_MOC} -o demo.moc $<
 
-demo_viewer.moc: demo_viewer.cpp
-	${QT_MOC} -o demo_viewer.moc $<
-
-demo_line.moc: demo_line.cpp
-	${QT_MOC} -o demo_line.moc $<
-
-demo_line_circle.moc: demo_line_circle.cpp
-	${QT_MOC} -o demo_line_circle.moc $<
-
-#demo_Lazy_line_circle.moc: demo_Lazy_line_circle.cpp
-#	${QT_MOC} -o demo_Lazy_line_circle.moc $<
-
 Qt_widget_get_arc.moc: Qt_widget_get_arc.h
 	$(QT_MOC) -o Qt_widget_get_arc.moc $<
 
@@ -68,18 +52,6 @@ Qt_widget_get_segment.moc: Qt_widget_get_segment.h
 demo$(EXE_EXT): demo.moc demo$(OBJ_EXT) Qt_widget_get_arc$(OBJ_EXT)
 	$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)demo demo$(OBJ_EXT) Qt_widget_get_arc$(OBJ_EXT) $(LDFLAGS)
 
-demo_viewer$(EXE_EXT): demo_viewer.moc demo_viewer$(OBJ_EXT) Qt_widget_get_segment$(OBJ_EXT) Qt_widget_get_arc$(OBJ_EXT)
-	$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)demo_viewer demo_viewer$(OBJ_EXT) Qt_widget_get_segment$(OBJ_EXT) Qt_widget_get_arc$(OBJ_EXT) $(LDFLAGS)
-
-demo_line$(EXE_EXT): demo_line.moc demo_line$(OBJ_EXT) Qt_widget_get_segment$(OBJ_EXT)
-	$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)demo_line demo_line$(OBJ_EXT) Qt_widget_get_segment$(OBJ_EXT) $(LDFLAGS)
-
-demo_line_circle$(EXE_EXT): demo_line_circle.moc demo_line_circle$(OBJ_EXT) Qt_widget_get_segment$(OBJ_EXT) Qt_widget_get_arc$(OBJ_EXT)
-	$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)demo_line_circle demo_line_circle$(OBJ_EXT) Qt_widget_get_segment$(OBJ_EXT) Qt_widget_get_arc$(OBJ_EXT) $(LDFLAGS)
-
-#demo_Lazy_line_circle$(EXE_EXT): demo_Lazy_line_circle.moc demo_Lazy_line_circle$(OBJ_EXT) Qt_widget_get_segment$(OBJ_EXT) Qt_widget_get_arc$(OBJ_EXT)
-#	$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)demo_Lazy_line_circle demo_Lazy_line_circle$(OBJ_EXT) Qt_widget_get_segment$(OBJ_EXT) Qt_widget_get_arc$(OBJ_EXT) $(LDFLAGS)
-
 Qt_widget_get_arc$(OBJ_EXT): Qt_widget_get_arc.cpp Qt_widget_get_arc.moc
 	$(CGAL_CXX) $(CXXFLAGS) $(OBJ_OPT) Qt_widget_get_arc.cpp
 
@@ -89,12 +61,8 @@ Qt_widget_get_segment$(OBJ_EXT): Qt_widget_get_segment.cpp Qt_widget_get_segment
 
 clean: \
                 demo.clean \
-		demo_viewer.clean\
-		demo_line.clean \
-		demo_line_circle.clean \
                 Qt_widget_get_arc.clean \
-		Qt_widget_get_segment.clean #\
-#		demo_Lazy_line_circle.clean
+		Qt_widget_get_segment.clean 
 
 #---------------------------------------------------------------------#
 #                    suffix rules
diff --git a/Circular_kernel_2/demo/Circular_kernel_2/README b/Circular_kernel_2/demo/Circular_kernel_2/README
new file mode 100644
index 00000000000..b8d158ab15f
--- /dev/null
+++ b/Circular_kernel_2/demo/Circular_kernel_2/README
@@ -0,0 +1,3 @@
+demo allows to enter line segments and circular arcs
+and computes the arrangement
+it also allows to read .dxf files (autocad format)
diff --git a/Circular_kernel_2/demo/Circular_kernel_2/demo_line_circle.cpp b/Circular_kernel_2/demo/Circular_kernel_2/demo.cpp
similarity index 100%
rename from Circular_kernel_2/demo/Circular_kernel_2/demo_line_circle.cpp
rename to Circular_kernel_2/demo/Circular_kernel_2/demo.cpp
diff --git a/Circular_kernel_2/demo/Circular_kernel_2/makefile b/Circular_kernel_2/demo/Circular_kernel_2/makefile
index 224ba79a257..0f32d4948de 100644
--- a/Circular_kernel_2/demo/Circular_kernel_2/makefile
+++ b/Circular_kernel_2/demo/Circular_kernel_2/makefile
@@ -36,41 +36,20 @@ LDFLAGS = \
 #---------------------------------------------------------------------#
 
 all:            \
-                demo$(EXE_EXT) \
-		demo_viewer$(EXE_EXT)\
-		demo_line$(EXE_EXT) \
-		demo_line_circle$(EXE_EXT)
+                demo$(EXE_EXT) 
 
 demo.moc: demo.cpp
 	${QT_MOC} -o demo.moc $<
 
-demo_viewer.moc: demo_viewer.cpp
-	${QT_MOC} -o demo_viewer.moc $<
-
-demo_line.moc: demo_line.cpp
-	${QT_MOC} -o demo_line.moc $<
-
-demo_line_circle.moc: demo_line_circle.cpp
-	${QT_MOC} -o demo_line_circle.moc $<
-
 Qt_widget_get_arc.moc: Qt_widget_get_arc.h
 	$(QT_MOC) -o Qt_widget_get_arc.moc $<
 
 Qt_widget_get_segment.moc: Qt_widget_get_segment.h
 	$(QT_MOC) -o Qt_widget_get_segment.moc $<
 
-
 demo$(EXE_EXT): demo.moc demo$(OBJ_EXT) Qt_widget_get_arc$(OBJ_EXT)
 	$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)demo demo$(OBJ_EXT) Qt_widget_get_arc$(OBJ_EXT) $(LDFLAGS)
 
-demo_viewer$(EXE_EXT): demo_viewer.moc demo_viewer$(OBJ_EXT) Qt_widget_get_segment$(OBJ_EXT) Qt_widget_get_arc$(OBJ_EXT)
-	$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)demo_viewer demo_viewer$(OBJ_EXT) Qt_widget_get_segment$(OBJ_EXT) Qt_widget_get_arc$(OBJ_EXT) $(LDFLAGS)
-
-demo_line$(EXE_EXT): demo_line.moc demo_line$(OBJ_EXT) Qt_widget_get_segment$(OBJ_EXT)
-	$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)demo_line demo_line$(OBJ_EXT) Qt_widget_get_segment$(OBJ_EXT) $(LDFLAGS)
-
-demo_line_circle$(EXE_EXT): demo_line_circle.moc demo_line_circle$(OBJ_EXT) Qt_widget_get_segment$(OBJ_EXT) Qt_widget_get_arc$(OBJ_EXT)
-	$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)demo_line_circle demo_line_circle$(OBJ_EXT) Qt_widget_get_segment$(OBJ_EXT) Qt_widget_get_arc$(OBJ_EXT) $(LDFLAGS)
 
 Qt_widget_get_arc$(OBJ_EXT): Qt_widget_get_arc.cpp Qt_widget_get_arc.moc
 	$(CGAL_CXX) $(CXXFLAGS) $(OBJ_OPT) Qt_widget_get_arc.cpp
@@ -81,9 +60,6 @@ Qt_widget_get_segment$(OBJ_EXT): Qt_widget_get_segment.cpp Qt_widget_get_segment
 
 clean: \
                 demo.clean \
-		demo_viewer.clean\
-		demo_line.clean \
-		demo_line_circle.clean \
                 Qt_widget_get_arc.clean \
 		Qt_widget_get_segment.clean 
 
diff --git a/Circular_kernel_2/dont_submit b/Circular_kernel_2/dont_submit
index a95264306b1..a7b6f27f4a3 100644
--- a/Circular_kernel_2/dont_submit
+++ b/Circular_kernel_2/dont_submit
@@ -10,3 +10,6 @@ test_Lazy_circular_kernel.C
 test_Lazy_Line_arc.C
 demo_Lazy_line_circle.cpp
 demo_elias.C
+demo_circle.cpp
+demo_line.cpp
+demo_viewer.cpp