diff --git a/.gitignore b/.gitignore
index 9c5c511..c0df8e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,13 +4,17 @@
 /jdm.properties
 /tmp
 /derbyDB/
+/build.sign
 
+developer_log.json
+.DS_Store
 debug-benchmark.json
 *.zip
 *.patch
 .VSCodeCounter*
 build.properties
 hs_err_pid*.log
+private.properties
 .DS_Store
 
 # deb packaging
diff --git a/build.xml b/build.xml
index 4979318..4ef5189 100644
--- a/build.xml
+++ b/build.xml
@@ -121,7 +121,13 @@
         <copy file="capacity.ps1" todir="dist"/>
         <copy file="disk-model.ps1" todir="dist"/>
         <!--<antcall target="buildinfo"/>-->
-        <copy file="pkg/macos/JDM.icns" todir="${dist.dir}"/>
+        <copy file="pkg/macos/images/JDiskMark.icns" todir="${dist.dir}"/>
+       <!-- Also provide icon files named to match the application/launcher names
+           jpackage for macOS expects an icon file whose filename matches the
+           application (or launcher) name. Create copies with and without the
+           version suffix so DMG/PKG generation finds them. -->
+       <copy file="pkg/macos/images/JDiskMark.icns" tofile="${dist.dir}/${pkg.name}-${version}.icns" failonerror="false"/>
+       <copy file="pkg/macos/images/JDiskMark.icns" tofile="${dist.dir}/${pkg.name}.icns" failonerror="false"/>
         <copy file="pkg/macos/run.sh" todir="${dist.dir}"/>
         <!--<copy file="build.properties" todir="dist"/>-->
         <!--<copy file="build.properties" todir="src/META-INF"/>-->
@@ -222,7 +228,7 @@
         <echo message="MSI installer created: ${dist.dir}/${jpackage.output.msi.targetname}"/>
     </target>
     
-    <target name="create-dmg" depends="clean, jar, -post-jar, -prepare-jpackage-input-jar" description="Creates the DMG installer using jpackage">
+    <target name="create-dmg" depends="clean, -pre-jar, jar, -post-jar, -prepare-jpackage-input-jar" description="Creates the DMG installer using jpackage">
         <property name="jpackage.input.dir.relative" value="${release.dir}"/>
 
         <echo message="Deleting existing dmg files: ${dist.dir}/${app.name}-*.dmg"/>
@@ -241,7 +247,7 @@
             <arg line="--name ${pkg.name}-${version}"/>
             <arg line="--app-version ${dmg.version}"/>
             <arg line="--vendor 'jdiskmark'"/>
-            <arg line="--icon '${dist.dir}/${release.dir}/JDM.icns'"/>
+            <arg line="--icon '${dist.dir}/${release.dir}/${app.name}.icns'"/>
             <arg line="--dest ${dist.dir}"/>
         </exec>
 
@@ -256,6 +262,109 @@
         <echo message="DMG installer created: ${dist.dir}/${jpackage.output.dmg.targetname}"/>
     </target>
     
+
+    <target name="create-pkg" depends="clean, -pre-jar, jar, -post-jar, -prepare-jpackage-input-jar" description="Creates the PKG installer using jpackage">
+        <property file="private.properties" /> 
+        <delete>
+            <fileset dir="dist" includes="*.pkg"/>
+        </delete>
+        <property name="flatlaf.jar" value="libs/flatlaf-3.3.jar"/>
+        <property name="temp.extract.dir" value="build.sign"/>
+        <delete dir="${temp.extract.dir}"/>
+        <mkdir dir="${temp.extract.dir}"/>
+    
+        <property name="jpackage.input.dir.relative" value="${release.dir}"/>
+
+        <echo message="Running jpackage to create pkg installer..."/>
+        <exec executable="jpackage" failonerror="true">
+            <arg line="--type pkg"/>
+            <arg line="--input ${dist.dir}/${release.dir}"/>
+            <arg line="--main-jar ${pkg.name}.jar"/>
+            <arg line="--main-class ${pkg.name}.App"/>
+            <arg line="--name ${pkg.name}-${version}"/>
+            <arg line="--app-version ${dmg.version}"/>
+            <arg line="--vendor 'jdiskmark'"/>
+            <arg line="--dest ${dist.dir}"/>
+            <arg line="--resource-dir pkg/macos/images"/>
+            
+            <arg value="--mac-sign"/>
+            <arg value="--mac-signing-key-user-name"/>
+            <arg value="${mac.signing.key.user.name}"/>
+            <arg value="--mac-package-identifier"/>
+            <arg value="${mac.package.identifier}"/>
+            <arg value="--mac-package-name"/>
+            <arg value="JDiskMark"/>
+        </exec>
+
+        <property name="jpackage.output.pkg.defaultname" value="${app.name}-${version}-${dmg.version}.pkg"/>
+        <property name="jpackage.output.pkg.targetname" value="${pkg.name}-${version}.pkg"/>
+        
+        <echo message="Renaming PKG from '${jpackage.output.pkg.defaultname}' to '${jpackage.output.pkg.targetname}' in ${dist.dir}"/>
+        <move file="${dist.dir}/${jpackage.output.pkg.defaultname}"
+              tofile="${dist.dir}/${jpackage.output.pkg.targetname}"
+              overwrite="true"/>
+
+        <echo message="PKG installer created: ${dist.dir}/${jpackage.output.pkg.targetname}"/>
+        
+        <unzip src="libs/flatlaf-3.3.jar" dest="${temp.extract.dir}">
+            <patternset>
+                <include name="com/formdev/flatlaf/natives/libflatlaf-macos-x86_64.dylib"/>
+                <include name="com/formdev/flatlaf/natives/libflatlaf-macos-arm64.dylib"/>
+            </patternset>
+        </unzip>
+        <echo message="Signing extracted dylibs..."/>
+
+<exec executable="codesign" failonerror="true">
+    <arg value="--force"/>
+    <arg value="--options"/><arg value="runtime"/>
+    <arg value="--entitlements"/><arg value="entitlements.plist"/>
+    <arg value="--timestamp"/>
+    <arg value="--sign"/> <arg value="${signing.identity}"/>
+    <arg value="${temp.extract.dir}/com/formdev/flatlaf/natives/libflatlaf-macos-x86_64.dylib"/>
+</exec>
+
+<exec executable="codesign" failonerror="true">
+    <arg value="--force"/>
+    <arg value="--options"/><arg value="runtime"/>
+    <arg value="--entitlements"/><arg value="entitlements.plist"/>
+    <arg value="--timestamp"/>
+    <arg value="--sign"/> <arg value="${signing.identity}"/>
+    <arg value="${temp.extract.dir}/com/formdev/flatlaf/natives/libflatlaf-macos-arm64.dylib"/>
+</exec>
+        <echo message="Repacking signed dylibs into JAR..."/>
+
+        <jar destfile="${flatlaf.jar}" update="yes">
+            <fileset dir="${temp.extract.dir}"/>
+        </jar>
+
+        <delete dir="${temp.extract.dir}"/>
+        <echo message="FlatLaf JAR successfully updated and signed."/>
+        
+    </target>
+    <target name="notarize-pkg" description="Submit the package for Apple notarization">
+        <!-- Populate the private.properties file with apple credentials -->
+        <property file="private.properties" /> 
+
+        <echo message="Submitting ${dist.dir}/jdiskmark-${version}.pkg for notarization..."/>
+
+        <exec executable="xcrun" failonerror="true">
+            <arg value="notarytool"/>
+            <arg value="submit"/>
+            <arg value="${dist.dir}/jdiskmark-${version}.pkg"/>
+
+            <arg value="--apple-id"/>
+            <arg value="${apple.id}"/>
+
+            <arg value="--password"/>
+            <arg value="${apple.password}"/>
+
+            <arg value="--team-id"/>
+            <arg value="${apple.team.id}"/>
+
+            <arg value="--wait"/>
+        </exec>
+    </target>
+
     <target name="sign-msi" depends="create-msi" description="Signs the MSI installer using signtool.exe (manual invocation)">
         <echo message="Signing MSI installer..."/>
         <condition property="signtool.is.available">
@@ -280,8 +389,10 @@
             <arg value="/a"/> <arg file="${msi.file.to.sign.path}"/> </exec>
         <echo message="MSI file successfully signed: ${msi.file.to.sign.path}"/>
     </target>
+    
     <target name="package-msi" depends="clean, jar, create-msi, sign-msi" description="Builds JAR and MSI installer"/>
     <target name="package-dmg" depends="clean, jar, create-dmg" description="Builds JAR and DMG installer"/>
+    <target name="package-pkg" depends="clean, jar, create-pkg, notarize-pkg" description="Builds PKG installer"/>
 
     <property name="deb.dir" value="jdiskmark-deb"/>
     <property name="deb.version" value="${version}-1"/>
diff --git a/entitlements.plist b/entitlements.plist
new file mode 100644
index 0000000..9acbcfa
--- /dev/null
+++ b/entitlements.plist
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>com.apple.security.cs.allow-jit</key>
+    <true/>
+    <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
+    <true/>
+    <key>com.apple.security.cs.disable-library-validation</key>
+    <true/>
+</dict>
+</plist>
\ No newline at end of file
diff --git a/pkg/macos/JDM.icns b/pkg/macos/images/JDiskMark.icns
similarity index 100%
rename from pkg/macos/JDM.icns
rename to pkg/macos/images/JDiskMark.icns