1 files changed, 13 insertions, 4 deletions

diff --git a/scripts/makepkg b/scripts/makepkg
index bbd3c73b..4dc44f1f 100755
--- a/scripts/makepkg
+++ b/scripts/makepkg
@@ -892,27 +892,36 @@ done
 # check for an install script
 if [ "$install" != "" ]; then
 	msg "Copying install script..."
-	cp $startdir/$install $startdir/pkg/.INSTALL
+	cp "$startdir/$install" "$startdir/pkg/.INSTALL"
+fi
+
+# do we have a changelog?
+have_changelog=0
+if [ -f "$startdir/Changelog" ]; then
+	msg "Copying package Changelog"
+	cp "$startdir/Changelog" "$startdir/pkg/.CHANGELOG"
+	have_changelog=1
 fi
 
 # build a filelist
 msg "Generating .FILELIST file..."
-cd $startdir/pkg
+cd "$startdir/pkg"
 tar cvf /dev/null * | sort >.FILELIST
 
 # tar it up
 msg "Compressing package..."
-cd $startdir/pkg
+cd "$startdir/pkg"
 
 pkg_file="$PKGDEST/$pkgname-$pkgver-$pkgrel-${CARCH}.${PKGEXT}"
 comp_files=".PKGINFO .FILELIST ${install:+.INSTALL}"
+[ $have_changelog -eq 1 ] && comp_files=".CHANGELOG $comp_files"
 
 if ! tar czf $pkg_file $comp_files *; then
 	error "Failed to create package file." 
 	exit 1
 fi
 
-cd $startdir
+cd "$startdir"
 if [ "$CLEANUP" = "1" ]; then
 	msg "Cleaning up..."
 	rm -rf src pkg