diff --git a/release/makesunpkg b/release/makesunpkg
index 45d38c49..eef47b01 100644
--- a/release/makesunpkg
+++ b/release/makesunpkg
@@ -73,57 +73,57 @@ cat >$TMPDIR/proto <<EOF
 i copyright
 i depend
 i pkginfo
-d none libjpeg-turbo 0755 root bin
-d none libjpeg-turbo/bin 0755 root bin
-f none libjpeg-turbo/bin/cjpeg 0755 root bin
-f none libjpeg-turbo/bin/djpeg 0755 root bin
-f none libjpeg-turbo/bin/jpegtran 0755 root bin
-f none libjpeg-turbo/bin/rdjpgcom 0755 root bin
-f none libjpeg-turbo/bin/wrjpgcom 0755 root bin
-d none libjpeg-turbo/lib 0755 root bin
+d none $PACKAGE_NAME 0755 root bin
+d none $PACKAGE_NAME/bin 0755 root bin
+f none $PACKAGE_NAME/bin/cjpeg 0755 root bin
+f none $PACKAGE_NAME/bin/djpeg 0755 root bin
+f none $PACKAGE_NAME/bin/jpegtran 0755 root bin
+f none $PACKAGE_NAME/bin/rdjpgcom 0755 root bin
+f none $PACKAGE_NAME/bin/wrjpgcom 0755 root bin
+d none $PACKAGE_NAME/lib 0755 root bin
 EOF
 if [ $COMBINED = 1 ]; then
 cat >>$TMPDIR/proto <<EOF
-f none libjpeg-turbo/lib/libjpeg.so.62.0.0 0755 root bin
-s none libjpeg-turbo/lib/libjpeg.so.62=libjpeg.so.62.0.0
-s none libjpeg-turbo/lib/libjpeg.so=libjpeg.so.62.0.0
-f none libjpeg-turbo/lib/libjpeg.a 0644 root bin
-f none libjpeg-turbo/lib/libturbojpeg.so 0755 root bin
-f none libjpeg-turbo/lib/libturbojpeg.a 0644 root bin
+f none $PACKAGE_NAME/lib/libjpeg.so.62.0.0 0755 root bin
+s none $PACKAGE_NAME/lib/libjpeg.so.62=libjpeg.so.62.0.0
+s none $PACKAGE_NAME/lib/libjpeg.so=libjpeg.so.62.0.0
+f none $PACKAGE_NAME/lib/libjpeg.a 0644 root bin
+f none $PACKAGE_NAME/lib/libturbojpeg.so 0755 root bin
+f none $PACKAGE_NAME/lib/libturbojpeg.a 0644 root bin
 EOF
 fi
 if [ "${__LIB}" != "lib" ]; then
-echo d none libjpeg-turbo/${__LIB} 0755 root bin >>$TMPDIR/proto
-echo s none libjpeg-turbo/lib64=${__LIB} >>$TMPDIR/proto
+echo d none $PACKAGE_NAME/${__LIB} 0755 root bin >>$TMPDIR/proto
+echo s none $PACKAGE_NAME/lib64=${__LIB} >>$TMPDIR/proto
 fi
 cat >>$TMPDIR/proto <<EOF
-f none libjpeg-turbo/${__LIB}/libjpeg.so.62.0.0 0755 root bin
-s none libjpeg-turbo/${__LIB}/libjpeg.so.62=libjpeg.so.62.0.0
-s none libjpeg-turbo/${__LIB}/libjpeg.so=libjpeg.so.62.0.0
-f none libjpeg-turbo/${__LIB}/libjpeg.a 0644 root bin
-f none libjpeg-turbo/${__LIB}/libturbojpeg.so 0755 root bin
-f none libjpeg-turbo/${__LIB}/libturbojpeg.a 0644 root bin
-s none libjpeg-turbo/lib32=lib
-d none libjpeg-turbo/man 0755 root bin
-d none libjpeg-turbo/man/man1 0755 root bin
-d none libjpeg-turbo/man/man1/cjpeg.1 0644 root bin
-d none libjpeg-turbo/man/man1/djpeg.1 0644 root bin
-d none libjpeg-turbo/man/man1/jpegtran.1 0644 root bin
-d none libjpeg-turbo/man/man1/rdjpgcom.1 0644 root bin
-d none libjpeg-turbo/man/man1/wrjpgcom.1 0644 root bin
-d none libjpeg-turbo/include 0755 root bin
-f none libjpeg-turbo/include/jconfig.h 0644 root bin
-f none libjpeg-turbo/include/jerror.h 0644 root bin
-f none libjpeg-turbo/include/jmorecfg.h 0644 root bin
-f none libjpeg-turbo/include/jpeglib.h 0644 root bin
-f none libjpeg-turbo/include/turbojpeg.h 0644 root bin
-d none libjpeg-turbo/doc 0755 root bin
-f none libjpeg-turbo/doc/LGPL.txt 0644 root bin
-f none libjpeg-turbo/doc/libjpeg.doc 0644 root bin
-f none libjpeg-turbo/doc/LICENSE.txt 0644 root bin
-f none libjpeg-turbo/doc/README 0644 root bin
-f none libjpeg-turbo/doc/README-turbo.txt 0644 root bin
-f none libjpeg-turbo/doc/usage.doc 0644 root bin
+f none $PACKAGE_NAME/${__LIB}/libjpeg.so.62.0.0 0755 root bin
+s none $PACKAGE_NAME/${__LIB}/libjpeg.so.62=libjpeg.so.62.0.0
+s none $PACKAGE_NAME/${__LIB}/libjpeg.so=libjpeg.so.62.0.0
+f none $PACKAGE_NAME/${__LIB}/libjpeg.a 0644 root bin
+f none $PACKAGE_NAME/${__LIB}/libturbojpeg.so 0755 root bin
+f none $PACKAGE_NAME/${__LIB}/libturbojpeg.a 0644 root bin
+s none $PACKAGE_NAME/lib32=lib
+d none $PACKAGE_NAME/man 0755 root bin
+d none $PACKAGE_NAME/man/man1 0755 root bin
+d none $PACKAGE_NAME/man/man1/cjpeg.1 0644 root bin
+d none $PACKAGE_NAME/man/man1/djpeg.1 0644 root bin
+d none $PACKAGE_NAME/man/man1/jpegtran.1 0644 root bin
+d none $PACKAGE_NAME/man/man1/rdjpgcom.1 0644 root bin
+d none $PACKAGE_NAME/man/man1/wrjpgcom.1 0644 root bin
+d none $PACKAGE_NAME/include 0755 root bin
+f none $PACKAGE_NAME/include/jconfig.h 0644 root bin
+f none $PACKAGE_NAME/include/jerror.h 0644 root bin
+f none $PACKAGE_NAME/include/jmorecfg.h 0644 root bin
+f none $PACKAGE_NAME/include/jpeglib.h 0644 root bin
+f none $PACKAGE_NAME/include/turbojpeg.h 0644 root bin
+d none $PACKAGE_NAME/doc 0755 root bin
+f none $PACKAGE_NAME/doc/LGPL.txt 0644 root bin
+f none $PACKAGE_NAME/doc/libjpeg.doc 0644 root bin
+f none $PACKAGE_NAME/doc/LICENSE.txt 0644 root bin
+f none $PACKAGE_NAME/doc/README 0644 root bin
+f none $PACKAGE_NAME/doc/README-turbo.txt 0644 root bin
+f none $PACKAGE_NAME/doc/usage.doc 0644 root bin
 EOF
 
 pkgmk -o -r $TMPDIR/pkgbuild -d $TMPDIR -a i386 -f $TMPDIR/proto