diff --git a/package/yast2-installation.changes b/package/yast2-installation.changes
index 8811dfd64..deab0e8b1 100644
--- a/package/yast2-installation.changes
+++ b/package/yast2-installation.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Jun  5 13:02:06 UTC 2013 - lslezak@suse.cz
+
+- use WFM::ClientExists() call instead of checking *.ycp file
+  presence (works also with non-YCP clients and checks also e.g.
+  /y2update/clients path)
+
 -------------------------------------------------------------------
 Mon May 27 15:27:12 CEST 2013 - locilka@suse.com
 
diff --git a/src/include/inst_inc_second.ycp b/src/include/inst_inc_second.ycp
index e0c985cb3..f008f3fab 100644
--- a/src/include/inst_inc_second.ycp
+++ b/src/include/inst_inc_second.ycp
@@ -399,7 +399,7 @@ Note: You may have to enter some information again.");
             SCR::Execute (.target.remove, Installation::current_step);
         }
 
-        if (WFM::Read (.local.size, "/usr/share/YaST2/clients/product_post.ycp") > 0)
+        if (WFM::ClientExists("product_post"))
             WFM::CallFunction ("product_post", [Mode::update ()]);
     }
 
diff --git a/src/inst_finish/driver_update2_finish.ycp b/src/inst_finish/driver_update2_finish.ycp
index 909e81ca2..ecb9ad657 100644
--- a/src/inst_finish/driver_update2_finish.ycp
+++ b/src/inst_finish/driver_update2_finish.ycp
@@ -64,8 +64,9 @@ if (func == "Info")
 else if (func == "Write")
 {
     Vendor::DriverUpdate2 ();
-    if (WFM::Read (.local.size, "/usr/share/YaST2/clients/product_finish.ycp") > 0)
-	WFM::CallFunction ("product_finish", [Mode::update ()]);
+
+    if (WFM::ClientExists("product_finish"))
+        WFM::CallFunction ("product_finish", [Mode::update ()]);
 }
 else
 {