diff --git a/cmake/BuildPackages.cmake b/cmake/BuildPackages.cmake
index 1493b5e..7aa0a3c 100644
--- a/cmake/BuildPackages.cmake
+++ b/cmake/BuildPackages.cmake
@@ -70,7 +70,25 @@
 
 
 #
+# Binary tarball
+#
+
+if(UNIX)
+
+configure_file(release/maketarball.in release/maketarball)
+
+add_custom_target(tarball sh release/maketarball
+  DEPENDS vncviewer vncpasswd vncconfig
+  SOURCES release/maketarball)
+
+add_custom_target(servertarball sh release/maketarball server
+  DEPENDS vncviewer vncpasswd vncconfig
+  SOURCES release/maketarball)
+
+endif() #UNIX
+
+#
 # Common
 #
 
-install(FILES ${CMAKE_SOURCE_DIR}/LICENCE.txt DESTINATION .)
+install(FILES ${CMAKE_SOURCE_DIR}/LICENCE.TXT DESTINATION doc)
diff --git a/release/maketarball.in b/release/maketarball.in
index 544dc21..b6740e4 100644
--- a/release/maketarball.in
+++ b/release/maketarball.in
@@ -15,12 +15,13 @@
 	fi
 }
 
-PACKAGE_NAME=@PACKAGE_NAME@
+PACKAGE_NAME=@CMAKE_PROJECT_NAME@
 VERSION=@VERSION@
 BUILD=@BUILD@
-SRCDIR=@srcdir@
-OS=`uname -s`
-CPU=@host_cpu@
+SRCDIR=@CMAKE_SOURCE_DIR@
+OS=@CMAKE_SYSTEM_NAME@
+CPU=@CMAKE_SYSTEM_PROCESSOR@
+PREFIX=@CMAKE_INSTALL_PREFIX@
 PACKAGE_FILE=$PACKAGE_NAME-$OS-$CPU-$VERSION.tar.gz
 SERVER=0
 
@@ -33,13 +34,29 @@
 umask 022
 TMPDIR=`mktemp -d /tmp/$PACKAGE_NAME-build.XXXXXX`
 rm -f $PACKAGE_FILE
+OUTDIR=$TMPDIR/inst/$PREFIX
+
+mkdir -p $OUTDIR/bin
+mkdir -p $OUTDIR/man/man1
+
+make DESTDIR=$TMPDIR/inst install
 if [ $SERVER = 1 ]; then
-	make xserver-install prefix=/opt/TigerVNC DESTDIR=$TMPDIR
-else
-	make install prefix=/opt/TigerVNC DESTDIR=$TMPDIR
+	pushd $SRCDIR/java/src/com/tigervnc/vncviewer
+	make
+	popd
+	install -m 755 ./xorg.build/bin/Xvnc $OUTDIR/bin/
+	install -m 644 ./xorg.build/man/man1/Xvnc.1 $OUTDIR/man/man1/Xvnc.1
+	install -m 644 ./xorg.build/man/man1/Xserver.1 $OUTDIR/man/man1/Xserver.1
+	mkdir -p $OUTDIR/vnc/classes/
+	install -m 644 $SRCDIR/java/src/com/tigervnc/vncviewer/index.vnc $OUTDIR/vnc/classes/
+	install -m 644 $SRCDIR/java/src/com/tigervnc/vncviewer/VncViewer.jar $OUTDIR/vnc/classes/
+	install -m 644 $SRCDIR/java/src/com/tigervnc/vncviewer/README $OUTDIR/vnc/classes/
+	mkdir -p $OUTDIR/lib/dri/
+	install -m 755 ./xorg.build/lib/dri/swrast_dri.so $OUTDIR/lib/dri/
 fi
-pushd $TMPDIR
-tar cfz $PACKAGE_FILE opt
+
+pushd $TMPDIR/inst
+tar cfz ../$PACKAGE_FILE .
 popd
 cp $TMPDIR/$PACKAGE_FILE .