diff --git a/Makefile b/Makefile
index 863440661e..cf230198f5 100644
--- a/Makefile
+++ b/Makefile
@@ -5,12 +5,7 @@
 # to offer. For more, execute that one directly. 
 #
 
-SOURCE=$(PWD)
-BUILD=$(SOURCE)/build
-TMP=/tmp/bro-dist.$(UID)
-BRO_V=`cat $(SOURCE)/VERSION`
-BROCCOLI_V=`cat $(SOURCE)/aux/broccoli/VERSION`
-BROCTL_V=`cat $(SOURCE)/aux/broctl/VERSION`
+BUILD=build
 
 all: configured
 	( cd $(BUILD) && make )
@@ -29,20 +24,7 @@ docclean: configured
 	( cd $(BUILD) && make docclean && make restclean )
 
 dist:
-	@( mkdir -p $(BUILD) && rm -rf $(TMP) && mkdir $(TMP) )
-	@cp -R $(SOURCE) $(TMP)/Bro-$(BRO_V)
-	@( cd $(TMP) && find . -name .git\* | xargs rm -rf )
-	@( cd $(TMP) && find . -name \*.swp | xargs rm -rf )
-	@( cd $(TMP) && find . -type d -name build | xargs rm -rf )
-	@( cd $(TMP) && tar -czf $(BUILD)/Bro-all-$(BRO_V).tar.gz Bro-$(BRO_V) )
-	@( cd $(TMP)/Bro-$(BRO_V)/aux && mv broccoli Broccoli-$(BROCCOLI_V) && \
-	    tar -czf $(BUILD)/Broccoli-$(BROCCOLI_V).tar.gz Broccoli-$(BROCCOLI_V) )
-	@( cd $(TMP)/Bro-$(BRO_V)/aux && mv broctl Broctl-$(BROCTL_V) && \
-	    tar -czf $(BUILD)/Broctl-$(BROCTL_V).tar.gz Broctl-$(BROCTL_V) )
-	@( cd $(TMP)/Bro-$(BRO_V)/aux && rm -rf Broctl* Broccoli* )
-	@( cd $(TMP) && tar -czf $(BUILD)/Bro-$(BRO_V).tar.gz Bro-$(BRO_V) )
-	@rm -rf $(TMP)
-	@echo "Distribution source tarballs have been compiled in $(BUILD)"
+	@./pkg/make-src-packages
 
 bindist:
 	@( cd pkg && ( ./make-deb-packages || ./make-mac-packages || \
diff --git a/pkg/make-src-packages b/pkg/make-src-packages
new file mode 100755
index 0000000000..996b546659
--- /dev/null
+++ b/pkg/make-src-packages
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+SOURCE="$( cd "$( dirname "$0" )" && cd .. && pwd )"
+BUILD=${SOURCE}/build
+TMP=/tmp/bro-dist.${UID}
+BRO_V=`cat ${SOURCE}/VERSION`
+BROCCOLI_V=`cat ${SOURCE}/aux/broccoli/VERSION`
+BROCTL_V=`cat ${SOURCE}/aux/broctl/VERSION`
+
+( mkdir -p ${BUILD} && rm -rf ${TMP} && mkdir ${TMP} )
+cp -R ${SOURCE} ${TMP}/Bro-${BRO_V}
+( cd ${TMP} && find . -name .git\* | xargs rm -rf )
+( cd ${TMP} && find . -name \*.swp | xargs rm -rf )
+( cd ${TMP} && find . -type d -name build | xargs rm -rf )
+( cd ${TMP} && tar -czf ${BUILD}/Bro-all-${BRO_V}.tar.gz Bro-${BRO_V} )
+( cd ${TMP}/Bro-${BRO_V}/aux && mv broccoli Broccoli-${BROCCOLI_V} && \
+        tar -czf ${BUILD}/Broccoli-${BROCCOLI_V}.tar.gz Broccoli-${BROCCOLI_V} )
+( cd ${TMP}/Bro-${BRO_V}/aux && mv broctl Broctl-${BROCTL_V} && \
+        tar -czf ${BUILD}/Broctl-${BROCTL_V}.tar.gz Broctl-${BROCTL_V} )
+( cd ${TMP}/Bro-${BRO_V}/aux && rm -rf Broctl* Broccoli* )
+( cd ${TMP} && tar -czf ${BUILD}/Bro-${BRO_V}.tar.gz Bro-${BRO_V} )
+rm -rf ${TMP}
+echo "Distribution source tarballs have been compiled in ${BUILD}"