diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8e15e525f..316f7c03b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,7 +32,7 @@ if (UNIX AND NOT APPLE)
   set(LINUX 1)
 endif (UNIX AND NOT APPLE)
 
-find_package(Qt4 4.5.0 REQUIRED QtCore QtGui QtOpenGL QtSql QtNetwork QtXml)
+find_package(Qt4 4.8.1 REQUIRED QtCore QtGui QtOpenGL QtSql QtNetwork QtXml)
 
 if(NOT APPLE)
   find_package(Qt4 COMPONENTS QtWebKit)
diff --git a/src/dbus/org.freedesktop.Avahi.EntryGroup.xml b/src/dbus/org.freedesktop.Avahi.EntryGroup.xml
index 2930d7eeb..ec7f13742 100644
--- a/src/dbus/org.freedesktop.Avahi.EntryGroup.xml
+++ b/src/dbus/org.freedesktop.Avahi.EntryGroup.xml
@@ -51,7 +51,7 @@
       <arg name="host" type="s" direction="in"/>
       <arg name="port" type="q" direction="in"/>
       <arg name="txt" type="aay" direction="in"/>
-      <annotation name="com.trolltech.QtDBus.QtTypeName.In8"
+      <annotation name="org.qtproject.QtDBus.QtTypeName.In8"
           value="QList&lt;QByteArray&gt;" />
     </method>
 
@@ -73,7 +73,7 @@
       <arg name="type" type="s" direction="in"/>
       <arg name="domain" type="s" direction="in"/>
       <arg name="txt" type="aay" direction="in"/>
-      <annotation name="com.trolltech.QtDBus.QtTypeName.In6"
+      <annotation name="org.qtproject.QtDBus.QtTypeName.In6"
           value="QList&lt;QByteArray&gt;" />
     </method>
 
diff --git a/src/dbus/org.freedesktop.Avahi.Server.xml b/src/dbus/org.freedesktop.Avahi.Server.xml
index f336f207c..49493b3e0 100644
--- a/src/dbus/org.freedesktop.Avahi.Server.xml
+++ b/src/dbus/org.freedesktop.Avahi.Server.xml
@@ -132,7 +132,7 @@
       <arg name="address" type="s" direction="out"/>
       <arg name="port" type="q" direction="out"/>
       <arg name="txt" type="aay" direction="out"/>
-      <annotation name="com.trolltech.QtDBus.QtTypeName.Out9"
+      <annotation name="org.qtproject.QtDBus.QtTypeName.Out9"
           value="QList&lt;QByteArray&gt;" />
       <arg name="flags" type="u" direction="out"/>
     </method>
diff --git a/src/dbus/org.freedesktop.MediaPlayer.player.xml b/src/dbus/org.freedesktop.MediaPlayer.player.xml
index fc81b98a7..1523ec00d 100644
--- a/src/dbus/org.freedesktop.MediaPlayer.player.xml
+++ b/src/dbus/org.freedesktop.MediaPlayer.player.xml
@@ -26,7 +26,7 @@
 
     <method name="GetStatus">
         <arg type="(iiii)" direction="out"/>
-        <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="DBusStatus"/>
+        <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="DBusStatus"/>
     </method>
 
     <method name="VolumeSet">
@@ -47,7 +47,7 @@
 
     <method name="GetMetadata">
         <arg type="a{sv}" direction="out"/>
-        <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QVariantMap"/>
+        <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QVariantMap"/>
     </method>
 
     <method name="GetCaps">
@@ -56,12 +56,12 @@
 
     <signal name="TrackChange">
         <arg type="a{sv}"/>
-        <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QVariantMap"/>
+        <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QVariantMap"/>
     </signal>
 
     <signal name="StatusChange">
         <arg type="(iiii)"/>
-        <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="DBusStatus"/>
+        <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="DBusStatus"/>
     </signal>
 
     <signal name="CapsChange">
diff --git a/src/dbus/org.freedesktop.MediaPlayer.root.xml b/src/dbus/org.freedesktop.MediaPlayer.root.xml
index 593e99177..6b8976ed0 100644
--- a/src/dbus/org.freedesktop.MediaPlayer.root.xml
+++ b/src/dbus/org.freedesktop.MediaPlayer.root.xml
@@ -13,7 +13,7 @@
 
         <method name="MprisVersion">
             <arg type="(qq)" direction="out"/>
-            <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="Version"/>
+            <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="Version"/>
         </method>
 
     </interface>
diff --git a/src/dbus/org.freedesktop.MediaPlayer.tracklist.xml b/src/dbus/org.freedesktop.MediaPlayer.tracklist.xml
index db8aabdae..d2db72f32 100644
--- a/src/dbus/org.freedesktop.MediaPlayer.tracklist.xml
+++ b/src/dbus/org.freedesktop.MediaPlayer.tracklist.xml
@@ -7,7 +7,7 @@
     <method name="GetMetadata">
         <arg type="i" direction="in" />
         <arg type="a{sv}" direction="out" />
-        <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QVariantMap"/>
+        <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QVariantMap"/>
     </method>
 
     <method name="GetCurrentTrack">
diff --git a/src/dbus/org.freedesktop.Notifications.xml b/src/dbus/org.freedesktop.Notifications.xml
index 41f733009..00e85ea53 100644
--- a/src/dbus/org.freedesktop.Notifications.xml
+++ b/src/dbus/org.freedesktop.Notifications.xml
@@ -22,7 +22,7 @@
       <arg name="body" type="s" direction="in"/>
       <arg name="actions" type="as" direction="in"/>
       <arg name="hints" type="a{sv}" direction="in"/>
-      <annotation name="com.trolltech.QtDBus.QtTypeName.In6" value="QVariantMap"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.In6" value="QVariantMap"/>
       <arg name="timeout" type="i" direction="in"/>
       <arg name="return_id" type="u" direction="out"/>
     </method>
diff --git a/src/dbus/org.freedesktop.UDisks.Device.xml b/src/dbus/org.freedesktop.UDisks.Device.xml
index 816dd6ffc..99d1c459f 100644
--- a/src/dbus/org.freedesktop.UDisks.Device.xml
+++ b/src/dbus/org.freedesktop.UDisks.Device.xml
@@ -636,7 +636,7 @@
 
     <method name="FilesystemListOpenFiles">
       <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QVariantList" />
+      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QVariantList" />
       <arg name="processes" direction="out" type="a(uus)">
         <doc:doc><doc:summary>
             An array of triples (<doc:tt>pid</doc:tt>, <doc:tt>uid</doc:tt>, command line for the process
@@ -1355,9 +1355,9 @@
 
     <method name="DriveBenchmark">
       <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QVariantList" />
-      <annotation name="com.trolltech.QtDBus.QtTypeName.Out1" value="QVariantList" />
-      <annotation name="com.trolltech.QtDBus.QtTypeName.Out2" value="QVariantList" />
+      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QVariantList" />
+      <annotation name="org.qtproject.QtDBus.QtTypeName.Out1" value="QVariantList" />
+      <annotation name="org.qtproject.QtDBus.QtTypeName.Out2" value="QVariantList" />
 
       <arg name="do_write_benchmark" direction="in" type="b">
         <doc:doc><doc:summary>
diff --git a/src/dbus/org.freedesktop.UDisks.xml b/src/dbus/org.freedesktop.UDisks.xml
index 07daea04d..f046d64bf 100644
--- a/src/dbus/org.freedesktop.UDisks.xml
+++ b/src/dbus/org.freedesktop.UDisks.xml
@@ -1051,7 +1051,7 @@
 
     <!-- TODO: maybe this should return a dictionary so we can grow it in the future? -->
     <property name="KnownFilesystems" type="a(ssbbbubbbbbbbb)" access="read">
-      <annotation name="com.trolltech.QtDBus.QtTypeName" value="QVariantList">
+      <annotation name="org.qtproject.QtDBus.QtTypeName" value="QVariantList">
       <doc:doc><doc:description><doc:para>
             An array of file systems known to the daemon and what features are supported.
             Each element in the array contains the following members:
diff --git a/src/dbus/org.mpris.MediaPlayer2.Player.xml b/src/dbus/org.mpris.MediaPlayer2.Player.xml
index 3c11567fa..2c5d8c768 100644
--- a/src/dbus/org.mpris.MediaPlayer2.Player.xml
+++ b/src/dbus/org.mpris.MediaPlayer2.Player.xml
@@ -27,7 +27,7 @@
 		<property name='Rate' type='d' access='readwrite'/>
 		<property name='Shuffle' type='b' access='readwrite'/>
 		<property name='Metadata' type='a{sv}' access='read'>
-			<annotation name="com.trolltech.QtDBus.QtTypeName" value="QVariantMap"/>
+                        <annotation name="org.qtproject.QtDBus.QtTypeName" value="QVariantMap"/>
 		</property>
 		<property name='Volume' type='d' access='readwrite'/>
 		<property name='Position' type='x' access='read'/>
diff --git a/src/dbus/org.mpris.MediaPlayer2.Playlists.xml b/src/dbus/org.mpris.MediaPlayer2.Playlists.xml
index f94b31f2f..4656a4d3c 100644
--- a/src/dbus/org.mpris.MediaPlayer2.Playlists.xml
+++ b/src/dbus/org.mpris.MediaPlayer2.Playlists.xml
@@ -6,7 +6,7 @@
 		<property name='PlaylistCount' type='u' access='read' />
 		<property name='Orderings' type='as' access='read' />
 		<property name='ActivePlaylist' type='(b(oss))' access='read'>
-			<annotation name="com.trolltech.QtDBus.QtTypeName" value="MaybePlaylist"/>
+                        <annotation name="org.qtproject.QtDBus.QtTypeName" value="MaybePlaylist"/>
 		</property>
 		<method name='ActivatePlaylist'>
 			<arg direction='in' name='PlaylistId' type='o' />
@@ -17,12 +17,12 @@
 			<arg direction='in' name='Order' type='s' />
 			<arg direction='in' name='ReverseOrder' type='b' />
 			<arg direction='out' name='Playlists' type='a(oss)' />
-			<annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MprisPlaylistList"/>
+                        <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="MprisPlaylistList"/>
 		</method>
 		<signal name='PlaylistChanged'>
 			<arg name='Playlist' type='(oss)' />
-			<annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="MprisPlaylist" />
+                        <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="MprisPlaylist" />
 		</signal>
-		<annotation name="com.trolltech.QtDBus.QtTypeName" value="MaybePlaylist" />
+                <annotation name="org.qtproject.QtDBus.QtTypeName" value="MaybePlaylist" />
 	</interface>
 </node>
diff --git a/src/dbus/org.mpris.MediaPlayer2.TrackList.xml b/src/dbus/org.mpris.MediaPlayer2.TrackList.xml
index 51b4bbc6a..a306db7dd 100644
--- a/src/dbus/org.mpris.MediaPlayer2.TrackList.xml
+++ b/src/dbus/org.mpris.MediaPlayer2.TrackList.xml
@@ -6,7 +6,7 @@
 		<method name='GetTracksMetadata'>
 			<arg direction='in' name='TrackIds' type='ao'/>
 			<arg direction='out' name='Metadata' type='aa{sv}'>
-				<annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="TrackMetadata" />
+                                <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="TrackMetadata" />
 			</arg>
 		</method>
 		<method name='AddTrack'>
@@ -26,7 +26,7 @@
 		</signal>
 		<signal name='TrackAdded'>
 			<arg name='Metadata' type='a{sv}'>
-				<annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="TrackMetadata"/>
+                                <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="TrackMetadata"/>
 			</arg>
 			<arg name='AfterTrack' type='o'/>
 		</signal>
@@ -36,7 +36,7 @@
 		<signal name='TrackMetadataChanged'>
 			<arg name='TrackId' type='o'/>
 			<arg name='Metadata' type='a{sv}'>
-				<annotation name="com.trolltech.QtDBus.QtTypeName.In1" value="TrackMetadata"/>
+                                <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="TrackMetadata"/>
 			</arg>
 		</signal>
 		<property name='Tracks' type='ao' access='read'/>