diff --git a/lib.sh b/lib.sh
index 01775a1..bb3c1d4 100644
--- a/lib.sh
+++ b/lib.sh
@@ -481,3 +481,12 @@ if check_debug; then
     debug_flag=1
     debug "debug mode is enabled"
 fi
+
+pkgbuild_cleanup() {
+    # $1 the file to process
+    # Strip all blanklines
+    sed -i '/^\s*$/d' $1
+    # Readd blanklines above build and package
+    sed -i '/^build\(\)/{x;p;x;}' $1
+    sed -i '/^package\(\)/{x;p;x;}' $1
+}
diff --git a/src/spl-utils/PKGBUILD.sh b/src/spl-utils/PKGBUILD.sh
index 6111b0b..68dd697 100755
--- a/src/spl-utils/PKGBUILD.sh
+++ b/src/spl-utils/PKGBUILD.sh
@@ -30,3 +30,5 @@ package() {
     install -D -m644 "\${srcdir}"/spl-utils.hostid "\${pkgdir}"/etc/hostid
 }
 EOF
+
+pkgbuild_cleanup "${spl_utils_pkgbuild_path}/PKGBUILD"
diff --git a/src/spl/PKGBUILD.sh b/src/spl/PKGBUILD.sh
index 66c2172..f1662f3 100755
--- a/src/spl/PKGBUILD.sh
+++ b/src/spl/PKGBUILD.sh
@@ -36,3 +36,5 @@ package() {
     sed -i "s+\${srcdir}++" \${pkgdir}/usr/src/spl-*/${kernel_mod_path}/Module.symvers
 }
 EOF
+
+pkgbuild_cleanup "${spl_pkgbuild_path}/PKGBUILD"
diff --git a/src/zfs-utils/PKGBUILD.sh b/src/zfs-utils/PKGBUILD.sh
index afabda5..77f57e6 100755
--- a/src/zfs-utils/PKGBUILD.sh
+++ b/src/zfs-utils/PKGBUILD.sh
@@ -52,3 +52,5 @@ package() {
     install -D -m644 "\${srcdir}"/zfs-utils.bash-completion-r1 "\${pkgdir}"/usr/share/bash-completion/completions/zfs
 }
 EOF
+
+pkgbuild_cleanup "${zfs_utils_pkgbuild_path}/PKGBUILD"
diff --git a/src/zfs/PKGBUILD.sh b/src/zfs/PKGBUILD.sh
index 5cff3c8..23ce659 100755
--- a/src/zfs/PKGBUILD.sh
+++ b/src/zfs/PKGBUILD.sh
@@ -38,3 +38,5 @@ package() {
     sed -i "s+\${srcdir}++" \${pkgdir}/usr/src/zfs-*/${kernel_mod_path}/Module.symvers
 }
 EOF
+
+pkgbuild_cleanup "${zfs_pkgbuild_path}/PKGBUILD"