diff --git a/samples/opengl/cube/cube.bkl b/samples/opengl/cube/cube.bkl
new file mode 100644
index 0000000000..efd8ace195
--- /dev/null
+++ b/samples/opengl/cube/cube.bkl
@@ -0,0 +1,16 @@
+<?xml version="1.0" ?>
+<!-- $Id$ -->
+
+<makefile>
+
+    <include file="../../../build/bakefiles/common_samples.bkl"/>
+
+    <exe id="cube" template="wx_sample" template_append="wx_append">
+        <sources>cube.cpp</sources>
+        <wx-lib>gl</wx-lib>
+        <wx-lib>core</wx-lib>
+        <wx-lib>base</wx-lib>
+        <win32-res>cube.rc</win32-res>
+    </exe>
+
+</makefile>
diff --git a/samples/opengl/opengl.bkl b/samples/opengl/opengl.bkl
deleted file mode 100644
index 5903409565..0000000000
--- a/samples/opengl/opengl.bkl
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" ?>
-<makefile>
-
-    <include file="../../build/bakefiles/common_samples.bkl"/>
-
-    <exe id="opengl" template="wx_sample" template_append="wx_append">
-        <sources>opengl.cpp</sources>
-        <wx-lib>core</wx-lib>
-        <wx-lib>base</wx-lib>
-        <win32-res>opengl.rc</win32-res>
-    </exe>
-
-</makefile>
diff --git a/samples/opengl/opengl_samples.bkl b/samples/opengl/opengl_samples.bkl
new file mode 100644
index 0000000000..9285d94ec3
--- /dev/null
+++ b/samples/opengl/opengl_samples.bkl
@@ -0,0 +1,16 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <include file="../../build/bakefiles/config.bkl"/>
+    
+    <template id="sub">
+        <dir>$(id)</dir>
+        <dependency-of>all</dependency-of>
+    </template>
+
+    <!-- all samples are enumerated here: -->
+    <subproject id="cube" template="sub"/>
+<!--    <subproject id="isosurf" template="sub"/>
+    <subproject id="penguin" template="sub"/> -->
+
+</makefile>