Update from ABS @ 186607
Prepare for TheSLinux