diff --git a/CMakeLists.txt b/CMakeLists.txt
index d9c07116c..3ffa534e5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -348,6 +348,20 @@ ADD_CUSTOM_TARGET(distclean
 			COMMAND make clean
 			COMMAND rm -rf `find -name cmake_install.cmake` `find -name Makefile` `find -type d -name CMakeFiles` CMakeCache.txt)
 
+#
+# add tarball-target
+#
+SET(TMP "lmms-${VERSION}")
+ADD_CUSTOM_TARGET(dist
+			COMMAND make clean
+			COMMAND rm -rf ${TMP}
+			COMMAND mkdir -p ${TMP}
+			COMMAND cp AUTHORS build_mingw32 ChangeLog CMakeLists.txt configure COPYING INSTALL lmms.1 lmms.rc.in lmms.spec.in README TODO ${TMP}
+			COMMAND cp -r buildtools cmake data include plugins src ${TMP}
+			COMMAND rm -rf `find ${TMP} -type d -name ".svn"`  `find ${TMP} -name cmake_install.cmake` `find ${TMP} -name Makefile` `find ${TMP} -type d -name CMakeFiles` ${TMP}/CMakeCache.txt
+			COMMAND tar cjf lmms-${VERSION}.tar.bz2 ${TMP}
+			COMMAND rm -rf ${TMP})
+
 
 IF(WANT_PCH)
     FIND_PACKAGE(PCHSupport)
diff --git a/ChangeLog b/ChangeLog
index b557e0b09..457180491 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@
 	- added locale targets
 	- added "update-locales" target
 	- added "distclean" target
+	- added "tarball" target
 
 	* plugins/organic/organic.cpp:
 	* plugins/triple_oscillator/triple_oscillator.cpp: