diff --git a/packages/mediacenter/xbmc/scripts/gputemp b/packages/mediacenter/xbmc/scripts/gputemp
index 7ce4fce138..7767e885a9 100755
--- a/packages/mediacenter/xbmc/scripts/gputemp
+++ b/packages/mediacenter/xbmc/scripts/gputemp
@@ -27,7 +27,12 @@ if lspci -n | grep 0300 | grep -q 10de; then
 fi
 
 if lspci -n | grep 0300 | grep -q 1002; then
-  [ -f /usr/bin/aticonfig ] && TEMP=`/usr/bin/aticonfig --od-gettemperature | grep Temperature | cut -f 2 -d "-" | cut -f 1 -d "." | sed -e "s, ,,"`
+	if [ -f /storage/.config/xorg.conf ]; then
+		XORG="/storage/.config/xorg.conf"
+	else
+		XORG="/etc/X11/xorg-fglrx.conf"
+	fi
+  [ -f /usr/bin/aticonfig ] && TEMP=`/usr/bin/aticonfig -i $XORG --od-gettemperature | grep Temperature | cut -f 2 -d "-" | cut -f 1 -d "." | sed -e "s, ,,"`
 fi
 
 echo "${TEMP} C"
diff --git a/packages/x11/driver/xf86-video-fglrx/config/xorg-fglrx.conf b/packages/x11/driver/xf86-video-fglrx/config/xorg-fglrx.conf
index 60f6205784..1ce2e85a0b 100644
--- a/packages/x11/driver/xf86-video-fglrx/config/xorg-fglrx.conf
+++ b/packages/x11/driver/xf86-video-fglrx/config/xorg-fglrx.conf
@@ -1,7 +1,11 @@
+Section "ServerLayout"
+	Identifier     "aticonfig Layout"
+	Screen      0  "screen" 0 0
+EndSection
+
 Section "Device"
   Identifier  "fglrx"
   Driver      "fglrx"
-
   Option      "HWCursor"              "false"
 EndSection
 
@@ -14,7 +18,7 @@ Section "Screen"
   Device       "fglrx"
   DefaultDepth 24
   SubSection   "Display"
-    Depth      24
+  Depth        24
   EndSubSection
 EndSection