diff --git a/CMakeLists.txt b/CMakeLists.txt
index e214d289..d77666b0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46,6 +46,7 @@ tde_setup_paths( )
 option( WITH_LIBVISUAL "Enable libvisual support" OFF )
 option( WITH_KONQSIDEBAR "Enable konqsidebar plugin" OFF )
 option( WITH_XINE "Enable xine-engine support" OFF )
+option( WITH_YAUAP "Enable yauap-engine support" OFF )
 option( WITH_IPOD "Enable iPod support from libgpod" OFF )
 option( WITH_IFP "Enable ifp support" OFF )
 option( WITH_NJB "Enable njb support" OFF )
diff --git a/amarok/src/engine/CMakeLists.txt b/amarok/src/engine/CMakeLists.txt
index 3192b710..448d6899 100644
--- a/amarok/src/engine/CMakeLists.txt
+++ b/amarok/src/engine/CMakeLists.txt
@@ -13,3 +13,4 @@
 
 add_subdirectory( void )
 tde_conditional_add_subdirectory( WITH_XINE xine )
+tde_conditional_add_subdirectory( WITH_YAUAP yauap )
diff --git a/amarok/src/engine/yauap/yauap-engine.cpp b/amarok/src/engine/yauap/yauap-engine.cpp
index 03164b7a..16d35db8 100644
--- a/amarok/src/engine/yauap/yauap-engine.cpp
+++ b/amarok/src/engine/yauap/yauap-engine.cpp
@@ -106,7 +106,7 @@ DBusConnection::open()
     dbus_connection_set_exit_on_disconnect( dbus_connection, false );
 
     /* create qt connection */
-    qt_connection = new DBusTQt::Connection( this );
+    qt_connection = new DBusQt::Connection( this );
     qt_connection->dbus_connection_setup_with_qt_main( dbus_connection );
 
     if ( !dbus_connection_add_filter(dbus_connection, signal_handler, context, NULL) )
@@ -236,7 +236,7 @@ DBusConnection::send_with_reply(const char* method, int first_arg_type, va_list
 
         DBusMessage* oldmsg = msg;
         msg = dbus_connection_send_with_reply_and_block(dbus_connection, oldmsg, -1, &error);
-        DBusDispatchtqStatus status;
+        DBusDispatchStatus status;
         while ((status = dbus_connection_get_dispatch_status(dbus_connection)) == DBUS_DISPATCH_DATA_REMAINS)
             dbus_connection_dispatch (dbus_connection);
         dbus_message_unref (oldmsg);
diff --git a/amarok/src/engine/yauap/yauap-engine.h b/amarok/src/engine/yauap/yauap-engine.h
index 03f5f668..2562cf5d 100644
--- a/amarok/src/engine/yauap/yauap-engine.h
+++ b/amarok/src/engine/yauap/yauap-engine.h
@@ -30,7 +30,7 @@ class DBusConnection : public TQObject
 {
     friend class yauapEngine;
 
-    DBusTQt::Connection *qt_connection;
+    DBusQt::Connection *qt_connection;
     DBusConnection *dbus_connection;
     yauapEngine *context;
     TQMutex m_mutex;