diff --git a/ChangeLog b/ChangeLog
index 60346b753a2d1eda9eab6ef3f55c0c8f196d0e47..12a662da55c9b2be9c6c8e9ba42efdca05569d32 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,8 @@
 2010-08-09  Steffen Kamper  <steffen@typo3.org>
 
+	* Follow-up to bug #15079: Add XCLASS-definitions to spritemanager classes
 	* Fixed bug #15403: Missing icons in workspace modules (swap version) (Thanks to Georg Ringer)
-	* Follow-up to bug #15079 : Change private to protected
+	* Follow-up to bug #15079: Change private to protected
 	* Fixed bug #15397: Fix special chars in class.t3lib_div.php
 
 2010-08-09  Christian Kuhn  <lolli@schwarzbu.ch>
diff --git a/t3lib/class.t3lib_spritemanager.php b/t3lib/class.t3lib_spritemanager.php
index e266b803270e026e0cbca9ba39bfe3707db89671..070f60cd14ea2359e1f66bde533d5ec25415c8a6 100644
--- a/t3lib/class.t3lib_spritemanager.php
+++ b/t3lib/class.t3lib_spritemanager.php
@@ -243,4 +243,7 @@ class t3lib_SpriteManager {
 	}
 }
 
+if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_spritemanager.php'])	{
+	include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_spritemanager.php']);
+}
 ?>
\ No newline at end of file
diff --git a/t3lib/spritemanager/class.t3lib_spritemanager_simplehandler.php b/t3lib/spritemanager/class.t3lib_spritemanager_simplehandler.php
index bde6d7d40be31f6ee843e5132847be595ebf728a..d542602faa3b7b61b3a0093b792ca1b28dbb02fe 100644
--- a/t3lib/spritemanager/class.t3lib_spritemanager_simplehandler.php
+++ b/t3lib/spritemanager/class.t3lib_spritemanager_simplehandler.php
@@ -250,4 +250,7 @@ class t3lib_spritemanager_SimpleHandler implements t3lib_spritemanager_SpriteIco
 	}
 }
 
+if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/spritemanager/class.t3lib_spritemanager_simplehandler.php'])	{
+	include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/spritemanager/class.t3lib_spritemanager_simplehandler.php']);
+}
 ?>
\ No newline at end of file
diff --git a/t3lib/spritemanager/class.t3lib_spritemanager_spritegenerator.php b/t3lib/spritemanager/class.t3lib_spritemanager_spritegenerator.php
index 9ac5b291a434df21f8f7829394048d60223ebd0a..24cfa0533f78091aa988539409f8f31306e77725 100644
--- a/t3lib/spritemanager/class.t3lib_spritemanager_spritegenerator.php
+++ b/t3lib/spritemanager/class.t3lib_spritemanager_spritegenerator.php
@@ -605,4 +605,8 @@ class t3lib_spritemanager_SpriteGenerator {
 	}
 
 }
+
+if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/spritemanager/class.t3lib_spritemanager_spritegenerator.php'])	{
+	include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/spritemanager/class.t3lib_spritemanager_spritegenerator.php']);
+}
 ?>
\ No newline at end of file