diff --git a/CMakeLists.txt b/CMakeLists.txt
index f1afb001f..60b77d20e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,6 +47,9 @@ IF( ENABLE_JREEN AND NOT LIBJREEN_FOUND )
     IF( UNIX AND NOT APPLE )
         SET( LIBJREEN_LIBRARY ${CMAKE_CURRENT_BINARY_DIR}/thirdparty/jreen/libjreen.so )
     ENDIF( UNIX AND NOT APPLE )
+    IF( WIN32 )
+	SET( LIBJREEN_LIBRARY ${CMAKE_CURRENT_BINARY_DIR}/thirdparty/jreen/libjreen.dll )
+    ENDIF( WIN32 )
     SET( LIBJREEN_FOUND  true )
     MESSAGE(STATUS "Internal libjreen: ${LIBJREEN_INCLUDE_DIR}, ${LIBJREEN_LIBRARY}")
 ENDIF( ENABLE_JREEN AND NOT LIBJREEN_FOUND )
diff --git a/src/sip/jabber/jabber_p.cpp b/src/sip/jabber/jabber_p.cpp
index 7411a0550..035da9d6d 100644
--- a/src/sip/jabber/jabber_p.cpp
+++ b/src/sip/jabber/jabber_p.cpp
@@ -12,7 +12,7 @@
 using namespace gloox;
 using namespace std;
 
-#define TOMAHAWK_CAP_NODE_NAME QLatin1String("http://tomahawk-player.org/")
+#define TOMAHAWK_CAP_NODE_NAME QString::fromAscii("http://tomahawk-player.org/")
 
 Jabber_p::Jabber_p( const QString& jid, const QString& password, const QString& server, const int port )
     : QObject()
@@ -42,6 +42,11 @@ Jabber_p::Jabber_p( const QString& jid, const QString& password, const QString&
     qDebug() << "Our JID set to:" << m_jid.full().c_str();
 
     m_client = QSharedPointer<gloox::Client>( new gloox::Client( m_jid, password.toStdString(), port ) );
+    const Capabilities *caps = m_client->presence().capabilities();
+    if( caps )
+    {
+        const_cast<Capabilities*>(caps)->setNode(TOMAHAWK_CAP_NODE_NAME.toStdString());
+    }
     m_server = server;
 }
 
diff --git a/src/sip/jreen/jabber.h b/src/sip/jreen/jabber.h
index 6792a8e10..32a38b588 100644
--- a/src/sip/jreen/jabber.h
+++ b/src/sip/jreen/jabber.h
@@ -34,7 +34,6 @@ public slots:
     void addContact( const QString &jid, const QString& msg = QString() );
 
 private slots:
-    void onAuthError( int, const QString& );
     void showAddFriendDialog();
 
 private:
diff --git a/src/sip/jreen/jabber_p.h b/src/sip/jreen/jabber_p.h
index 44d45e57d..645e0d039 100644
--- a/src/sip/jreen/jabber_p.h
+++ b/src/sip/jreen/jabber_p.h
@@ -60,7 +60,6 @@ public slots:
 
     void onDisconnect(jreen::Client::DisconnectReason reason);
     void onConnect();
-    void onDestroy();
 
 private slots:
     virtual void onNewPresence( const jreen::Presence& presence );