diff --git a/cervisia/cvsservice/CMakeLists.txt b/cervisia/cvsservice/CMakeLists.txt
index f3181c04..111c3027 100644
--- a/cervisia/cvsservice/CMakeLists.txt
+++ b/cervisia/cvsservice/CMakeLists.txt
@@ -51,11 +51,11 @@ tde_add_library( cvsservice SHARED AUTOMOC
 
 tde_add_tdeinit_executable( cvsservice AUTOMOC
   SOURCES
-    main.cpp cvsservice.cpp cvsjob.cpp cvsservice.skel cvsservice.stub
-    cvsjob.skel cvsjob.stub repository.cpp repository.skel
-    repository.stub sshagent.cpp cvsserviceutils.cpp cvsloginjob.cpp
+    main.cpp cvsservice.cpp cvsjob.cpp cvsservice.skel
+    cvsjob.skel repository.cpp repository.skel
+    sshagent.cpp cvsserviceutils.cpp cvsloginjob.cpp
     cvsloginjob.skel cvsloginjob.stub
-  LINK tdeio-shared
+  LINK tdeio-shared cvsservice-shared
 )
 
 
diff --git a/umbrello/umbrello/codegenerators/CMakeLists.txt b/umbrello/umbrello/codegenerators/CMakeLists.txt
index 7d683330..5521f430 100644
--- a/umbrello/umbrello/codegenerators/CMakeLists.txt
+++ b/umbrello/umbrello/codegenerators/CMakeLists.txt
@@ -51,4 +51,6 @@ tde_add_library( codegenerator STATIC AUTOMOC
     phpwriter.cpp pythonwriter.cpp rubywriter.cpp sqlwriter.cpp
     tclwriter.cpp xmlschemawriter.cpp xmlelementcodeblock.cpp
     xmlcodecomment.cpp codegen_utils.cpp
+  DEPENDENCIES
+    dialogs-static
 )