diff --git a/Makefile.am b/Makefile.am
index b1ee711..3abab7f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-EXTRA_DIST = COPYING NEWS README STATUS slapi-nis.spec doc/*.txt doc/examples/*.ldif.in doc/devel doc/ipa src/nisserver-plugin-defs.1
+EXTRA_DIST = COPYING NEWS README STATUS slapi-nis.spec doc/*.txt doc/examples/*.ldif.in doc/devel doc/ipa src/nisserver-plugin-defs.1 yp/yp.x
 SUBDIRS = yp src tests
 ACLOCAL_AMFLAGS=-I m4
 
diff --git a/tests/clients/Makefile.am b/tests/clients/Makefile.am
index 2a7dfde..dc1319a 100644
--- a/tests/clients/Makefile.am
+++ b/tests/clients/Makefile.am
@@ -1,5 +1,5 @@
 EXTRA_DIST = ypmaplist.py
-AM_CFLAGS = @TIRPC_CFLAGS@ @RPC_CFLAGS@
+AM_CFLAGS = @TIRPC_CFLAGS@ @RPC_CFLAGS@ -I../../yp
 if CAN_TEST
 noinst_PROGRAMS = yp ldifsort
 yp_SOURCES = yp.c ../../yp/yp_clnt.c ../../yp/yp_xdr.c
diff --git a/yp/Makefile.am b/yp/Makefile.am
index a926ec7..a75aa22 100644
--- a/yp/Makefile.am
+++ b/yp/Makefile.am
@@ -1,4 +1,3 @@
-EXTRA_FILES = yp.x
 CLEANFILES = yp.h yp_xdr.c yp_clnt.c
 
 all: $(CLEANFILES)