diff --git a/.gitmodules b/.gitmodules
index f2dca625e..d4a9485fa 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -28,9 +28,6 @@
 [submodule "packages/plunit"]
 	path = packages/plunit
 	url = git://git.code.sf.net/p/yap/plunit
-[submodule "packages/R"]
-	path = packages/R
-	url = git://git.code.sf.net/p/yap/R
 [submodule "packages/real"]
 	path = packages/real
 	url = git://git.code.sf.net/p/yap/real
diff --git a/pl/CMakeLists.txt b/pl/CMakeLists.txt
new file mode 100644
index 000000000..b24d299c5
--- /dev/null
+++ b/pl/CMakeLists.txt
@@ -0,0 +1,73 @@
+set(PL_SOURCES
+	absf.yap
+	arith.yap
+	arithpreds.yap
+	arrays.yap
+	attributes.yap
+	atoms.yap
+	boot.yap
+	callcount.yap
+	checker.yap
+	chtypes.yap
+	consult.yap
+	control.yap
+	corout.yap
+	debug.yap
+	dbload.yap
+	depth_bound.yap
+	dialect.yap
+	directives.yap
+	eam.yap
+	eval.yap
+	errors.yap
+	flags.yap
+	grammar.yap
+	ground.yap
+	hacks.yap
+	init.yap
+	listing.yap
+	lists.yap
+	messages.yap
+	load_foreign.yap
+	modules.yap
+	os.yap
+	preddecls.yap
+	preds.yap
+	profile.yap
+	protect.yap
+	qly.yap
+	save.yap
+	setof.yap
+	signals.yap
+	sort.yap
+	statistics.yap
+	strict_iso.yap
+	tabling.yap
+	threads.yap
+	udi.yap
+	undefined.yap
+	utils.yap
+	history.pl
+	swi.yap
+	yapor.yap
+	yio.yap
+  )
+
+add_custom_target (${YAP_STARTUP} ALL DEPENDS ${PL_SOURCES} ) # WORKING_DIRECTORY ${CMAKE_BINARY_DIR} )
+
+# create a startup.yss on the top directory.
+add_custom_command (TARGET ${YAP_STARTUP}
+  COMMAND yap-bin -b ${CMAKE_SOURCE_DIR}/pl/boot.yap -L ${CMAKE_SOURCE_DIR}/pl/init.yap -z qend_program
+  VERBATIM
+  WORKING_DIRECTORY ${CMAKE_TOP_BINARY_DIR}
+  DEPENDS yap-bin
+  )
+
+install (FILES ${PL_SOURCES}
+  DESTINATION ${libpl}/boot
+  )
+  
+install (FILES ${CMAKE_TOP_BINARY_DIR}/${YAP_STARTUP}
+  DESTINATION ${dlls}
+  )
+