diff -ur pkgbuild-1.3.105.orig/pkgdb.pm.in pkgbuild-1.3.105/pkgdb.pm.in
--- pkgbuild-1.3.105.orig/pkgdb.pm.in	2015-06-01 10:46:15.536550664 +0900
+++ pkgbuild-1.3.105/pkgdb.pm.in	2015-06-01 10:51:38.685752085 +0900
@@ -495,7 +495,13 @@
 	my @pkglist = ();
 	my $branch = `uname -v`;
 	chomp($branch);
-	$branch =~ s/^[^0-9]*([0-9]+).*/$1/;
+	if ($branch =~ /^omnios/i) {
+	    my $line = `cat /etc/release | head -1`;
+	    chomp($line);
+	    $branch = $1 if ($line =~ /OmniOS.*r(\d+)/i);
+	} else {
+	    $branch =~ s/^[^0-9]*([0-9]+).*/$1/;
+	}
 	my $highest_branch;
 	my $ptype_h_b;
 	my $pname_h_b;
diff -ur pkgbuild-1.3.105.orig/pkgtool.pl pkgbuild-1.3.105/pkgtool.pl
--- pkgbuild-1.3.105.orig/pkgtool.pl	2015-06-01 10:46:15.536877742 +0900
+++ pkgbuild-1.3.105/pkgtool.pl	2015-06-01 10:51:38.687935601 +0900
@@ -329,6 +329,11 @@
 	$os_build = `uname -v`;
 	chomp ($os_build);
 	$os_build =~ s/.*_([0-9]+).*/$1/;
+	if ($os_build =~ /^omnios/i) {
+	    my $line = `cat /etc/release | head -1`;
+	    chomp($line);
+	    $os_build = $1 if ($line =~ /OmniOS.*r(\d+)/i);
+	}
     }
 
     my $uid;
diff -ur pkgbuild-1.3.105.orig/rpm_package.pm pkgbuild-1.3.105/rpm_package.pm
--- pkgbuild-1.3.105.orig/rpm_package.pm	2015-06-01 10:46:15.539284036 +0900
+++ pkgbuild-1.3.105/rpm_package.pm	2015-06-01 11:02:30.257404321 +0900
@@ -64,6 +64,11 @@
 	$os_build = `uname -v`;
 	chomp ($os_build);
 	$os_build =~ s/^\S+_([0-9]+).*/$1/;
+	if ($os_build =~ /^omnios/i) {
+	    my $line = `cat /etc/release | head -1`;
+	    chomp($line);
+	    $os_build = $1 if ($line =~ /OmniOS.*r(\d+)/i);
+        }
 	$os_build = "0.$os_build";
     }
     $self->{_tags}->{ips_vendor_version} = "$os_build";