diff --git a/buildpkg.packaging.solaris b/buildpkg.packaging.solaris
index a57b8ad..a07918d 100644
--- a/buildpkg.packaging.solaris
+++ b/buildpkg.packaging.solaris
@@ -438,6 +438,15 @@ parse_def()
 		    # Add scripts if requested
 		    auto_deps $secname $pkgname
 		    add_scripts $secname
+		    # Reset variables
+		    unset pkgname
+		    unset name
+		    unset pkgcat
+		    unset pkgvendor
+		    unset pkgdesc
+		    unset shortdesc
+		    unset pkgver
+		    unset maxinst
 		fi
 		;;
 	    *)
@@ -504,6 +513,15 @@ parse_def()
 	    # Add scripts if requested
 	    auto_deps $secname $pkgname
 	    add_scripts $secname
+	    # Reset variables
+	    unset pkgname
+	    unset name
+	    unset pkgcat
+	    unset pkgvendor
+	    unset pkgdesc
+	    unset shortdesc
+	    unset pkgver
+	    unset maxinst
 	fi
     fi
 }