diff --git a/Makefile b/Makefile
index 9c79bb79..791b42d1 100644
--- a/Makefile
+++ b/Makefile
@@ -3,10 +3,12 @@
 buildrelease: clean sourceball mingwbin
 
 sourceball:
-	rm -rf vgmstream.export
-	svn export . vgmstream.export
-	tar cvzf "vgmstream-`./version.sh`.tar.gz" vgmstream.export/*
-	rm -rf vgmstream.export
+	rm -rf vgmstream-`./version.sh`
+	svn export . vgmstream-`./version.sh`
+	echo "#!/bin/sh" > vgmstream-`./version.sh`/version.sh
+	echo "echo \"`./version.sh`\"" >> vgmstream-`./version.sh`/version.sh
+	tar cvzf "vgmstream-`./version.sh`.tar.gz" vgmstream-`./version.sh`/*
+	rm -rf vgmstream-`./version.sh`
 
 mingwbin: mingw_test mingw_winamp
 	zip -j "vgmstream-`./version.sh`-test.zip" readme.txt LICENSE test/test.exe winamp/in_vgmstream.dll 
@@ -18,8 +20,7 @@ mingw_winamp:
 	$(MAKE) -C winamp in_vgmstream.dll
 
 clean:
-	rm -f vgmstream-*.tar.gz
-	rm -f vgmstream-*-test.zip
+	rm -f vgmstream-*
 	$(MAKE) -C test clean
 	$(MAKE) -C test -f Makefile.mingw clean
 	$(MAKE) -C winamp clean
diff --git a/version.sh b/version.sh
index cd4b21cb..15666960 100755
--- a/version.sh
+++ b/version.sh
@@ -1,7 +1,4 @@
+#!/bin/sh
 DIR="`dirname "$0"`"
 VERSION="`svnversion "$DIR" | tr : _`"
-if [[ "$VERSION" = "exported" ]] ; then
-echo "exported"
-else
 echo "r$VERSION"
-fi