diff --git a/Makefile.am b/Makefile.am
index 6f36c3336..e76adf863 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,3 +5,24 @@ SUBDIRS = asn1 util client daemons install ipaclient ipalib ipaplatform ipapytho
 # init
 
 MOSTLYCLEANFILES = ipasetup.pyc ipasetup.pyo
+
+# user-facing scripts
+dist_bin_SCRIPTS = ipa
+
+# files required for build but not installed
+dist_noinst_SCRIPTS = ignore_import_errors.py \
+		      lite-server.py \
+		      makeapi \
+		      makeaci \
+		      make-doc \
+		      make-test \
+		      pylint_plugins.py
+
+EXTRA_DIST = .mailmap \
+	     ACI.txt \
+	     API.txt \
+	     BUILD.txt \
+	     Contributors.txt \
+	     COPYING.openssl \
+	     pylintrc \
+	     pytest.ini