<commit_before>diff --git a/agent-ypserv/conf/Makefile.am b/agent-ypserv/conf/Makefile.am
index b2a9e01..e69de29 100644
--- a/agent-ypserv/conf/Makefile.am
+++ b/agent-ypserv/conf/Makefile.am
@@ -1,7 +0,0 @@
-#
-# Makefile.am for core/agent-ypserv/conf
-#
-
-scrconf_DATA = ypserv.scr
-
-EXTRA_DIST = $(scrconf_DATA)
diff --git a/agents/Makefile.am b/agents/Makefile.am
index 9f64c0a..b9dae7f 100644
--- a/agents/Makefile.am
+++ b/agents/Makefile.am
@@ -4,11 +4,7 @@
 # $Id$
 #
 
-agent_SCRIPTS = ag_yp_conf
-
-scrconf_DATA = cfg_ypbind.scr yp_conf.scr
-
 TESTS = test-ypconf
 testdata = test-ypconf-i.in test-ypconf-i.out test-ypconf-o.out
 
-EXTRA_DIST = $(agent_SCRIPTS) $(scrconf_DATA) $(TESTS) $(testdata)
+EXTRA_DIST = $(TESTS) $(testdata)
diff --git a/doc/autodocs/Makefile.am b/doc/autodocs/Makefile.am
index 2a6f678..4cb582c 100644
--- a/doc/autodocs/Makefile.am
+++ b/doc/autodocs/Makefile.am
@@ -1,3 +1,5 @@
 # Makefile.am for YCP module .../doc/autodocs
 
-include $(top_srcdir)/autodocs-ycp.ami
+# TODO FIXME: temporarily disabled
+
+# include $(top_srcdir)/autodocs-ycp.ami
diff --git a/yast2-nis-client.spec.in b/yast2-nis-client.spec.in
index 8a34023..0afab19 100644
--- a/yast2-nis-client.spec.in
+++ b/yast2-nis-client.spec.in
@@ -18,6 +18,8 @@ Provides:	yast2-trans-nis
 Obsoletes:	yast2-trans-nis
 Provides:	yast2-config-network:/usr/lib/YaST2/clients/lan_ypclient.ycp
 
+Requires:       yast2-ruby-bindings >= 1.0.0
+
 Summary:	YaST2 - Network Information Services (NIS, YP) Configuration
 
 %description
@@ -35,10 +37,10 @@ yellow pages.
 %files
 %defattr(-,root,root)
 %dir @yncludedir@/nis
-@yncludedir@/nis/ui.ycp
-@clientdir@/nis.ycp<commit_msg>nis-client - fix agent test<commit_after>diff --git a/agent-ypserv/conf/Makefile.am b/agent-ypserv/conf/Makefile.am
index b2a9e01..e69de29 100644
--- a/agent-ypserv/conf/Makefile.am
+++ b/agent-ypserv/conf/Makefile.am
@@ -1,7 +0,0 @@
-#
-# Makefile.am for core/agent-ypserv/conf
-#
-
-scrconf_DATA = ypserv.scr
-
-EXTRA_DIST = $(scrconf_DATA)
diff --git a/agents/Makefile.am b/agents/Makefile.am
index 9f64c0a..b9dae7f 100644
--- a/agents/Makefile.am
+++ b/agents/Makefile.am
@@ -4,11 +4,7 @@
 # $Id$
 #
 
-agent_SCRIPTS = ag_yp_conf
-
-scrconf_DATA = cfg_ypbind.scr yp_conf.scr
-
 TESTS = test-ypconf
 testdata = test-ypconf-i.in test-ypconf-i.out test-ypconf-o.out
 
-EXTRA_DIST = $(agent_SCRIPTS) $(scrconf_DATA) $(TESTS) $(testdata)
+EXTRA_DIST = $(TESTS) $(testdata)
diff --git a/agents/test-ypconf b/agents/test-ypconf
index 3246ae8..7695983 100755
--- a/agents/test-ypconf
+++ b/agents/test-ypconf
@@ -2,7 +2,7 @@
 # $Id$
 set -o errexit
 
-AGENT=./ag_yp_conf
+AGENT=../src/servers_non_y2/ag_yp_conf
 CASE=test-ypconf
 AGPROG='YpConf ("'$CASE'-i.in")
 Read (.)'
diff --git a/doc/autodocs/Makefile.am b/doc/autodocs/Makefile.am
index 2a6f678..4cb582c 100644
--- a/doc/autodocs/Makefile.am
+++ b/doc/autodocs/Makefile.am
@@ -1,3 +1,5 @@
 # Makefile.am for YCP module .../doc/autodocs
 
-include $(top_srcdir)/autodocs-ycp.ami
+# TODO FIXME: temporarily disabled
+
+# include $(top_srcdir)/autodocs-ycp.ami
diff --git a/yast2-nis-client.spec.in b/yast2-nis-client.spec.in
index 8a34023..95af8fd 100644
--- a/yast2-nis-client.spec.in
+++ b/yast2-nis-client.spec.in
@@ -18,6 +18,8 @@ Provides:	yast2-trans-nis
 Obsoletes:	yast2-trans-nis
 Provides:	yast2-config-network:/usr/lib/YaST2/clients/lan_ypclient.ycp
 
+Requires:       yast2-ruby-bindings >= 1.0.0
+
 Summary:	YaST2 - Network Information Services (NIS, YP) Configuration
 
 %description
@@ -35,10 +37,10 @@ yellow pages.
 %files
 %defattr(-,root,root)
 %dir @yncludedir@/nis
-@yncludedir@/nis/ui.ycp
-@clientdir@/nis.ycp
{'fraction_non_alphanumeric': 0.1801259238981659, 'fraction_numerical': 0.058855735012318645, 'mean_word_length': 3.7087628865979383, 'pattern_counts': {'":': 0, '<': 3, '<?xml version=': 0, '>': 5, 'https://': 0, 'lorem ipsum': 0, 'www.': 0, 'xml': 0}, 'pii_count': 0, 'substrings_counts': 0, 'word_list_counts': {'cursed_substrings.json': 0, 'profanity_word_list.json': 0, 'sexual_word_list.json': 0, 'zh_pornsignals.json': 0}}
{'dir': 'git-commits-cleaned', 'id': '205461', 'n_tokens_mistral': 1768, 'n_tokens_neox': 1626, 'n_words': 247}