diff --git a/SConstruct b/SConstruct
index a82c9060f..26ecf132f 100644
--- a/SConstruct
+++ b/SConstruct
@@ -55,22 +55,14 @@ env = Setup.defineBuildEnvironment()
 env = Platform.configure(env)
 
 
-#####################################################################
-
-doxydoc = env.Doxygen('doc/devel/Doxyfile')
-env.Alias ('doc', doxydoc)
-env.Clean ('doc', doxydoc + ['doc/devel/,doxylog','doc/devel/warnings.txt'])
-#  env.Install(dir = '$DESTDIR/share/doc/lumiera$VERSION/devel', source=doxydoc)
-
-
 
 ### === MAIN BUILD === ##############################################
 
 # call subdir SConscript(s) for to define the actual build targets
-SConscript(dirs=['data','src','src/tool','research','tests'], exports='env')
+SConscript(dirs=['data','src','src/tool','research','tests','doc'], exports='env')
 
 # artifacts defined by the build targets
-Import('lumiera plugins tools gui testsuite')
+Import('lumiera plugins tools gui testsuite doxydoc')
 
 
 
@@ -84,6 +76,8 @@ env.Clean ('build', [ 'src/pre.gch' ])
 
 build = env.Alias('build', lumiera + plugins + tools +gui)
 
+env.Alias ('doc', doxydoc)
+
 env.Alias ('all', build + testsuite + doxydoc)
 env.Default('build')
 # SCons default target
diff --git a/doc/SConscript b/doc/SConscript
new file mode 100644
index 000000000..60c0964ab
--- /dev/null
+++ b/doc/SConscript
@@ -0,0 +1,17 @@
+# -*- python -*-
+##
+## SConscript  -  SCons buildscript for Documentation
+##
+
+from Buildhelper import scanSubtree
+
+Import('env')
+
+
+doxydoc = env.Doxygen('devel/Doxyfile')
+
+#  env.Install(dir = '$DESTDIR/share/doc/lumiera$VERSION/devel', source=documentation)
+env.Clean (doxydoc, doxydoc + ['devel/,doxylog','devel/warnings.txt'])
+
+
+Export('doxydoc')