diff --git a/lib/Makefile.am b/lib/Makefile.am
index 0c7f919..630df04 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -38,7 +38,7 @@ libsearpc_la_LIBADD = @GLIB2_LIBS@  @GOBJECT_LIBS@ @JSON_GLIB_LIBS@
 
 genrpc_files = gencode.py rpc_table.py
 
-dist_data_DATA = ${genrpc_files}
+EXTRA_DIST = ${genrpc_files}
 
 gensource: ${generated_sources}
 
diff --git a/pysearpc/Makefile.am b/pysearpc/Makefile.am
index b6bd4b3..aeb12da 100644
--- a/pysearpc/Makefile.am
+++ b/pysearpc/Makefile.am
@@ -8,18 +8,20 @@ AM_CFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" \
 	-I${top_builddir}/lib \
 	-I${top_srcdir}/lib
 
-pkgpyexec_PYTHON = __init__.py client.py
+pysearpcdir=${pyexecdir}/pysearpc
+
+pysearpc_PYTHON = __init__.py client.py
 
 BUILT_SOURCES = fcallfret.h
 
 # generating the fcallfret module
-pkgpyexec_LTLIBRARIES = fcallfret.la
+pysearpc_LTLIBRARIES = fcallfret.la
 
 fcallfret_la_LDFLAGS = -module -avoid-version -export-symbols-regex initfcallfret
 fcallfret_la_SOURCES = fcallfret.c fcallfret.h
 fcallfret_la_LIBADD = @GLIB2_LIBS@ @GOBJECT_LIBS@ $(top_builddir)/lib/libsearpc.la
 
-dist_data_DATA = ${genrpc_files}
+EXTRA_DIST = ${genrpc_files}
 
 fcallfret.h: ${genrpc_files}
 	python pygencode.py > fcallfret.h