diff --git a/configure.ac b/configure.ac
index 2136625b..6bc57e61 100644
--- a/configure.ac
+++ b/configure.ac
@@ -420,11 +420,11 @@ AC_CONFIG_FILES([ \
 	simgear/scene/Makefile \
 	simgear/scene/material/Makefile \
 	simgear/scene/model/Makefile \
+	simgear/scene/sky/Makefile \
+	simgear/scene/sky/clouds3d/Makefile \
 	simgear/scene/tgdb/Makefile \
 	simgear/screen/Makefile \
 	simgear/serial/Makefile \
-	simgear/sky/Makefile \
-	simgear/sky/clouds3d/Makefile \
 	simgear/sound/Makefile \
 	simgear/threads/Makefile \
 	simgear/timing/Makefile \
diff --git a/simgear/Makefile.am b/simgear/Makefile.am
index 77b86ed3..99e8d601 100644
--- a/simgear/Makefile.am
+++ b/simgear/Makefile.am
@@ -28,7 +28,6 @@ SUBDIRS = \
 	scene \
 	screen \
 	serial \
-	sky \
 	sound \
 	$(SGTHREAD_DIR) \
 	timing \
diff --git a/simgear/scene/Makefile.am b/simgear/scene/Makefile.am
index 21e3b295..c6aed399 100644
--- a/simgear/scene/Makefile.am
+++ b/simgear/scene/Makefile.am
@@ -1,6 +1,6 @@
 includedir = @includedir@/scene
 
-SUBDIRS = material model tgdb
+SUBDIRS = material model sky tgdb
 
 # lib_LIBRARIES = libsgscene.a
 
diff --git a/simgear/scene/sky/Makefile.am b/simgear/scene/sky/Makefile.am
index c2364339..9ff4cf7e 100644
--- a/simgear/scene/sky/Makefile.am
+++ b/simgear/scene/sky/Makefile.am
@@ -1,4 +1,4 @@
-includedir = @includedir@/sky
+includedir = @includedir@/scene/sky
 
 # SUBDIRS = clouds3d
 
diff --git a/simgear/scene/sky/sky.hxx b/simgear/scene/sky/sky.hxx
index 7ddb440a..46d69cda 100644
--- a/simgear/scene/sky/sky.hxx
+++ b/simgear/scene/sky/sky.hxx
@@ -42,11 +42,11 @@
 
 #include <vector>
 
-#include <simgear/sky/cloud.hxx>
-#include <simgear/sky/dome.hxx>
-#include <simgear/sky/moon.hxx>
-#include <simgear/sky/oursun.hxx>
-#include <simgear/sky/stars.hxx>
+#include <simgear/scene/sky/cloud.hxx>
+#include <simgear/scene/sky/dome.hxx>
+#include <simgear/scene/sky/moon.hxx>
+#include <simgear/scene/sky/oursun.hxx>
+#include <simgear/scene/sky/stars.hxx>
 
 SG_USING_STD(vector);