diff --git a/eiskaltdcpp-qt/CMakeLists.txt b/eiskaltdcpp-qt/CMakeLists.txt
index c6ac07e..d56d10a 100644
--- a/eiskaltdcpp-qt/CMakeLists.txt
+++ b/eiskaltdcpp-qt/CMakeLists.txt
@@ -110,8 +110,11 @@ set (SRCS
             src/WulforSettings.cpp
             src/WulforUtil.cpp
             src/ChatEdit.cpp
-            src/qtsingleapp/qtsinglecoreapplication.cpp
-            )
+           )
+if (NOT HAIKU)
+    set (SRCS ${SRCS} src/qtsingleapp/qtsinglecoreapplication.cpp)
+endif (NOT HAIKU)
+
 set (MOC_HDRS
             src/ActionCustomizer.h
             src/ADLS.h
@@ -184,8 +187,11 @@ set (MOC_HDRS
             src/WulforSettings.h
             src/WulforUtil.h
             src/ChatEdit.h
-            src/qtsingleapp/qtsinglecoreapplication.h
-            )
+           )
+if (NOT HAIKU)
+           set (MOC_HDRS ${MOC_HDRS} src/qtsingleapp/qtsinglecoreapplication.h)
+endif (NOT HAIKU)
+
 set (UI_FORMS ui/UIAbout.ui
             ui/UIAntiSpam.ui
             ui/UIADLSearch.ui
@@ -313,6 +319,7 @@ if (UNIX)
                 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/)
 endif (UNIX)

+
 EXECUTE_PROCESS (
     COMMAND ${QT_RCC_EXECUTABLE} -binary  ${DEFAULT_QRC_FILE} -o ${PROJECT_BINARY_DIR}/default.rcc
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/
@@ -402,6 +409,10 @@ else (APPLE)
   target_link_libraries (eiskaltdcpp-qt ${LIBS} dcpp)
 endif (APPLE)

+if (HAIKU)
+  target_link_libraries (eiskaltdcpp-qt ${LIBS} network locale be tracker)
+endif (HAIKU)
+
 if (APPLE)
   set_property (TARGET eiskaltdcpp-qt PROPERTY OUTPUT_NAME "${PROJECT_NAME_GLOBAL}")
 else (APPLE)
@@ -489,4 +500,10 @@ if (APPLE)

 endif (APPLE)

+if (HAIKU)
+  EXECUTE_PROCESS (
+                COMMAND rc -o ${PROJECT_BINARY_DIR}/haiku.rsrc ../haiku/haiku.rdef
+               COMMAND xres -o ${PROJECT_BINARY_DIR}/eiskaltdcpp-qt ${PROJECT_BINARY_DIR}/haiku.rsrc)
+endif (HAIKU)
+
 include(CPack)
diff --git a/eiskaltdcpp-qt/src/main.cpp b/eiskaltdcpp-qt/src/main.cpp
index d74609b..e03c7f7 100644
--- a/eiskaltdcpp-qt/src/main.cpp
+++ b/eiskaltdcpp-qt/src/main.cpp
@@ -88,6 +88,7 @@ int main(int argc, char *argv[])

     parseCmdLine(app.arguments());

+#ifndef Q_WS_HAIKU
     if (app.isRunning()){
         QStringList args = app.arguments();
         args.removeFirst();//remove path to executable
@@ -96,6 +97,7 @@ int main(int argc, char *argv[])

         return 0;
     }
+#endif

 #if !defined (Q_WS_WIN) && !defined (Q_WS_HAIKU)
     installHandlers();
@@ -136,7 +138,9 @@ int main(int argc, char *argv[])
     MainWindow::newInstance();
     MainWindow::getInstance()->setUnload(!WBGET(WB_TRAY_ENABLED));

+#ifndef Q_WS_HAIKU
     app.connect(&app, SIGNAL(messageReceived(QString)), MainWindow::getInstance(), SLOT(parseInstanceLine(QString)));
+#endif

     HubManager::newInstance();