diff --git a/create_pnor_image.pl b/create_pnor_image.pl
index 4f7f9a3..2cf220c 100755
--- a/create_pnor_image.pl
+++ b/create_pnor_image.pl
@@ -21,7 +21,6 @@
 my $openpower_version_filename = "";
 my $wofdata_binary_filename = "";
 my $memddata_binary_filename = "";
-my $hdat_binary_filename = "";
 
 while (@ARGV > 0){
     $_ = $ARGV[0];
@@ -100,10 +99,6 @@
         $memddata_binary_filename = $ARGV[1] or die "Bad command line arg given: expecting a memddata binary filename.\n";
         shift;
     }
-    elsif (/^-hdat_binary_filename/i){
-        $hdat_binary_filename = $ARGV[1] or die "Bad command line arg given: expecting a hdat binary filename.\n";
-        shift;
-    }
     else {
         print "Unrecognized command line arg: $_ \n";
         print "To view all the options and help text run \'$program_name -h\' \n";
@@ -139,6 +134,7 @@
 $build_pnor_command .= " --binFile_DJVPD $scratch_dir/djvpd_fill.bin.ecc";
 $build_pnor_command .= " --binFile_CVPD $scratch_dir/cvpd.bin.ecc";
 $build_pnor_command .= " --binFile_ATTR_TMP $scratch_dir/attr_tmp.bin.ecc";
+$build_pnor_command .= " --binFile_ATTR_PERM $scratch_dir/attr_perm.bin.ecc";
 $build_pnor_command .= " --binFile_OCC $occ_binary_filename.ecc";
 $build_pnor_command .= " --binFile_FIRDATA $scratch_dir/firdata.bin.ecc";
 $build_pnor_command .= " --binFile_CAPP $scratch_dir/cappucode.bin.ecc";
@@ -149,7 +145,6 @@
 if ($release eq "p9"){
     $build_pnor_command .= " --binFile_WOFDATA $wofdata_binary_filename" if -e $wofdata_binary_filename;
     $build_pnor_command .= " --binFile_MEMD $memddata_binary_filename" if -e $memddata_binary_filename;
-    $build_pnor_command .= " --binFile_HDAT $hdat_binary_filename" if -e $hdat_binary_filename;
 }
 if ($release eq "p8"){
     $build_pnor_command .= " --binFile_SBEC $scratch_dir/$sbec_binary_filename";
diff --git a/p9Layouts/defaultPnorLayout_64.xml b/p9Layouts/defaultPnorLayout_64.xml
index 8547494..a626275 100644
--- a/p9Layouts/defaultPnorLayout_64.xml
+++ b/p9Layouts/defaultPnorLayout_64.xml
@@ -282,11 +282,6 @@ Layout Description
         <side>A</side>
         <reprovision/>
     </section>
-<!-- Commenting this temporarily as a workaround for accomadating 
-     new partition. Due to incorrect Toc size assumption, currently
-     we are unable to create more than 31 partitions. Until the 
-     proper fix comes in, commenting this out based on internal 
-     discussion.
     <section>
         <description>Permanent Attribute Override (32K)</description>
         <eyeCatch>ATTR_PERM</eyeCatch>
@@ -297,7 +292,6 @@ Layout Description
         <reprovision/>
         <clearOnEccErr/>
     </section>
--->
     <section>
         <description>PNOR Version (4K)</description>
         <eyeCatch>VERSION</eyeCatch>
@@ -366,14 +360,4 @@ Layout Description
         <readOnly/>
         <ecc/>
     </section>
-    <section>
-        <description>HDAT binary data (16KB)</description>
-        <eyeCatch>HDAT</eyeCatch>
-        <physicalOffset>0x2BC6000</physicalOffset>
-        <physicalRegionSize>0x8000</physicalRegionSize>
-        <side>sideless</side>
-        <sha512Version/>
-        <readOnly/>
-        <ecc/>
-    </section>
 </pnor>
diff --git a/update_image.pl b/update_image.pl
index 849d131..976bc62 100755
--- a/update_image.pl
+++ b/update_image.pl
@@ -32,7 +32,6 @@
 my $pnor_layout = "";
 my $debug = 0;
 my $sign_mode = "";
-my $hdat_binary_filename = "";
 
 while (@ARGV > 0){
     $_ = $ARGV[0];
@@ -143,11 +142,6 @@
         $memd_binary_filename = $ARGV[1];
         shift;
     }
-    elsif(/^-hdat_binary_filename/i){
-        # This filename is necessary if the file exists, but if its not given, we add blank partition
-        $hdat_binary_filename = $ARGV[1];
-        shift;
-    }
     else {
         print "Unrecognized command line arg: $_ \n";
         #print "To view all the options and help text run \'$program_name -h\' \n";
@@ -268,6 +262,7 @@ sub processConvergedSections {
     $sections{MVPD}{out}        = "$scratch_dir/mvpd_fill.bin.ecc";
     $sections{DJVPD}{out}       = "$scratch_dir/djvpd_fill.bin.ecc";
     $sections{ATTR_TMP}{out}    = "$scratch_dir/attr_tmp.bin.ecc";
+    $sections{ATTR_PERM}{out}   = "$scratch_dir/attr_perm.bin.ecc";
     $sections{FIRDATA}{out}     = "$scratch_dir/firdata.bin.ecc";
     $sections{SECBOOT}{out}     = "$scratch_dir/secboot.bin.ecc";
     $sections{RINGOVD}{out}     = "$scratch_dir/ringOvd.bin";
@@ -291,17 +286,6 @@ sub processConvergedSections {
         print "WARNING: MEMD partition is not found, including blank binary instead\n";
     }
     $sections{MEMD}{out}       = "$scratch_dir/memd_extra_data.bin.ecc";
-   
-    # SMC COPY SAME ideas for hdat 
-    if(-e $hdat_binary_filename)
-    {
-        $sections{HDAT}{in}    = "$hdat_binary_filename";
-    }
-    else
-    {
-        print "WARNING: HDAT partition is not found, including blank binary instead\n";
-    }
-    $sections{HDAT}{out}       = "$scratch_dir/hdat.bin.ecc";
 
     # Build up the system bin files specification
     my $system_bin_files;
@@ -489,6 +473,10 @@ sub processConvergedSections {
     run_command("dd if=/dev/zero bs=28K count=1 | tr \"\\000\" \"\\377\" > $scratch_dir/hostboot.temp.bin");
     run_command("ecc --inject $scratch_dir/hostboot.temp.bin --output $scratch_dir/attr_tmp.bin.ecc --p8");
 
+    # Create blank binary file for ATTR_PERM partition
+    run_command("dd if=/dev/zero bs=28K count=1 | tr \"\\000\" \"\\377\" > $scratch_dir/hostboot.temp.bin");
+    run_command("ecc --inject $scratch_dir/hostboot.temp.bin --output $scratch_dir/attr_perm.bin.ecc --p8");
+
     # Create blank binary file for FIRDATA partition
     run_command("dd if=/dev/zero bs=8K count=1 | tr \"\\000\" \"\\377\" > $scratch_dir/hostboot.temp.bin");
     run_command("ecc --inject $scratch_dir/hostboot.temp.bin --output $scratch_dir/firdata.bin.ecc --p8");