--- a/Makefile.am
+++ b/Makefile.am
@@ -163,21 +163,27 @@
                  src/mediaserver/cdplugins/uprcl/uprcluntagged.py \
                  src/mediaserver/cdplugins/uprcl/uprclutils.py
 
-EXTRA_DIST = web.tar.gz rdpl2stream.tar.gz systemd/upmpdcli.service \
+EXTRA_DIST = web.tar.gz rdpl2stream.tar.gz uprclbottle.tar.gz \
+    systemd/upmpdcli.service \
     src/conftree.cpp src/execmd.cpp src/mediaserver/cdplugins/cmdtalk.cpp \
-    src/netcon.cpp
+    src/netcon.cpp autogen.sh
 
 web.tar.gz: bogus
 	if test -d $(srcdir)/web; then \
-           (cd $(srcdir); tar cvzf - web) > web.tar.gz; fi
+           (cd $(srcdir); tar cvzf - web) > web.tar.gz; \
+        fi
 
 uprclbottle.tar.gz: bogus
+	if test -d $(srcdir)/src/mediaserver/cdplugins/uprcl/bottle; then \
 	(cd $(srcdir)/src/mediaserver; tar cvzf - cdplugins/uprcl/bottle) > \
-            uprclbottle.tar.gz
+            uprclbottle.tar.gz; \
+        fi
 
 rdpl2stream.tar.gz: bogus
-	(cd $(srcdir); rm -rf rdpl2stream/__pycache__/; \
-           tar cvzf - rdpl2stream) > rdpl2stream.tar.gz
+	if test -d $(srcdir)/rdpl2stream; then \
+	    (cd $(srcdir); rm -rf rdpl2stream/__pycache__/; \
+               tar cvzf - rdpl2stream) > rdpl2stream.tar.gz; \
+        fi
 
 bogus: