diff --git a/code/ryzom/client/src/client_sheets/sky_sheet.cpp b/code/ryzom/client/src/client_sheets/sky_sheet.cpp
index 4d3c35caf..e47aac582 100644
--- a/code/ryzom/client/src/client_sheets/sky_sheet.cpp
+++ b/code/ryzom/client/src/client_sheets/sky_sheet.cpp
@@ -24,6 +24,7 @@ CSkySheet::CSkySheet()
 	Type = SKY;
 	WaterEnvMapCameraHeight = 0.f;
 	WaterEnvMapAlpha = 255;
+	SunClipZ = -1.0f;
 }
 
 // *****************************************************************************************************
@@ -53,6 +54,8 @@ void CSkySheet::build(const NLGEORGES::UFormElm &item, const std::string &prefix
 	item.getValueByName(FogColorBitmap, (prefix + "FogColorBitmap").c_str());
 	item.getValueByName(WaterEnvMapCameraHeight, (prefix + "WaterEnvMapCameraHeight").c_str());
 	item.getValueByName(WaterEnvMapAlpha, (prefix + "WaterEnvMapAlpha").c_str());
+	item.getValueByName(SunSource, (prefix + "SunSource").c_str());
+	item.getValueByName(SunClipZ, (prefix + "SunClipZ").c_str());
 }
 
 // *****************************************************************************************************
@@ -67,6 +70,8 @@ void CSkySheet::serial(class NLMISC::IStream &f) throw(NLMISC::EStream)
 	f.serial(FogColorBitmap);
 	f.serial(WaterEnvMapCameraHeight);
 	f.serial(WaterEnvMapAlpha);
+	f.serial(SunSource);
+	f.serial(SunClipZ);
 }
 
 // *****************************************************************************************************
diff --git a/code/ryzom/client/src/client_sheets/sky_sheet.h b/code/ryzom/client/src/client_sheets/sky_sheet.h
index 3ec207f27..319992847 100644
--- a/code/ryzom/client/src/client_sheets/sky_sheet.h
+++ b/code/ryzom/client/src/client_sheets/sky_sheet.h
@@ -39,6 +39,9 @@ public:
 	// Water env map (computed from sky scene)
 	float		WaterEnvMapCameraHeight;
 	uint8		WaterEnvMapAlpha;
+	// Sun direction override
+	std::string	SunSource;
+	float		SunClipZ;
 public:
 	// ctor
 	CSkySheet();
diff --git a/code/ryzom/client/src/light_cycle_manager.cpp b/code/ryzom/client/src/light_cycle_manager.cpp
index 1f7175dba..2bf664130 100644
--- a/code/ryzom/client/src/light_cycle_manager.cpp
+++ b/code/ryzom/client/src/light_cycle_manager.cpp
@@ -477,7 +477,15 @@ void CLightCycleManager::setDirLight(const CDirLightSetup &setup0, const CDirLig
 	scene.setSunAmbient  (resultSetup.Ambiant);
 	scene.setSunDiffuse  (resultSetup.Diffuse);
 	scene.setSunSpecular (resultSetup.Specular);
-	scene.setSunDirection(resultSetup.Direction);
+	CSky &sky = ContinentMngr.cur()->CurrentSky;
+	if (sky.overrideSunDirection())
+	{
+		scene.setSunDirection(sky.calculateSunDirection());
+	}
+	else
+	{
+		scene.setSunDirection(resultSetup.Direction);
+	}
 }
 
 //-----------------------------------------------
diff --git a/code/ryzom/client/src/sky.cpp b/code/ryzom/client/src/sky.cpp
index 855ab3387..d086bad60 100644
--- a/code/ryzom/client/src/sky.cpp
+++ b/code/ryzom/client/src/sky.cpp
@@ -48,6 +48,8 @@ CSky::CSky()
 	_FogColor = NULL;
 	_WaterEnvMapCameraHeight = 0.f;
 	_WaterEnvMapAlpha = 255;
+	_SunSource = -1;
+	_SunClipZ = -1.0f;
 }
 
 // *************************************************************************************************
@@ -217,6 +219,39 @@ void CSky::init(UDriver *drv, const CSkySheet &sheet, bool forceFallbackVersion
 	_NumHourInDay = numHourInDay;
 	_WaterEnvMapCameraHeight = sheet.WaterEnvMapCameraHeight;
 	_WaterEnvMapAlpha= sheet.WaterEnvMapAlpha;
+	//
+	// Find sun source
+	std::string sunSource = NLMISC::toLower(sheet.SunSource);
+	_SunSource = -1;
+	if (sunSource.size())
+	{
+		uint numObjects = (uint)_Objects.size();
+		for (uint k = 0; k < numObjects; ++k)
+		{
+			if (NLMISC::toLower(_Objects[k].Name) == sunSource)
+			{
+				nldebug("Found sun source: '%s'", sunSource.c_str());
+				_SunSource = k;
+			}
+		}
+	}
+	_SunClipZ = sheet.SunClipZ;
+}
+
+// *************************************************************************************************
+bool CSky::overrideSunDirection() const
+{
+	return (_SunSource >= 0)
+		&& (_Objects[_SunSource].Instance.getLastClippedState());
+}
+
+// *************************************************************************************************
+NLMISC::CVector CSky::calculateSunDirection() const
+{
+	CVector sunPos = _Objects[_SunSource].Instance.getLastWorldMatrixComputed().getPos();
+	CVector baseDir = (-sunPos).normed();
+	baseDir.z = std::max(_SunClipZ, baseDir.z);
+	return baseDir.normed();
 }
 
 // *************************************************************************************************
diff --git a/code/ryzom/client/src/sky.h b/code/ryzom/client/src/sky.h
index 9c9f56d1f..07797c3e4 100644
--- a/code/ryzom/client/src/sky.h
+++ b/code/ryzom/client/src/sky.h
@@ -63,6 +63,8 @@ public:
 	NLMISC::CRGBA	 computeFogColor(const CClientDate &date, float weatherLevel) const;
 	float			 getWaterEnvMapCameraHeight() const { return _WaterEnvMapCameraHeight; }
 	uint8			 getWaterEnvMapAlpha() const { return _WaterEnvMapAlpha; }
+	bool overrideSunDirection() const;
+	NLMISC::CVector calculateSunDirection() const;
 private:
 	std::vector<CSkyObject> _Objects; // all the object in the sky
 	std::vector<NLMISC::CBitmap *>	_Bitmaps; // all the bitmaps for the color lookups
@@ -80,6 +82,8 @@ private:
 	NLMISC::CBitmap			*_FogColor;
 	float					_WaterEnvMapCameraHeight;
 	uint8					_WaterEnvMapAlpha;
+	sint					_SunSource;
+	float					_SunClipZ;
 };