diff -ur pkgbuild-1.3.103.orig/pkgdb.pm.in pkgbuild-1.3.103/pkgdb.pm.in
--- pkgbuild-1.3.103.orig/pkgdb.pm.in	2015-05-13 22:59:41.074983243 +0900
+++ pkgbuild-1.3.103/pkgdb.pm.in	2015-05-13 23:34:24.766304541 +0900
@@ -469,7 +469,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 $pname_h_b;
 	foreach my $ips_line (@ips_lines) {
diff -ur pkgbuild-1.3.103.orig/pkgtool.pl pkgbuild-1.3.103/pkgtool.pl
--- pkgbuild-1.3.103.orig/pkgtool.pl	2015-05-13 22:59:41.076271603 +0900
+++ pkgbuild-1.3.103/pkgtool.pl	2015-05-13 23:01:40.143829400 +0900
@@ -326,6 +326,14 @@
 	$os_build = `uname -v`;
 	chomp ($os_build);
 	$os_build =~ s/.*_([0-9]+).*/$1/;
+        $os_build = `uname -v`;
+        if ($os_build =~ /^omnios/i) {
+            my $line = `cat /etc/release | head -1`;
+            chomp($line);
+            if ($line =~ /OmniOS.*r(\d+)/i) {
+                  $os_build = $1;
+            }
+        }
     }
 
     my $uid;
diff -ur pkgbuild-1.3.103.orig/rpm_package.pm pkgbuild-1.3.103/rpm_package.pm
--- pkgbuild-1.3.103.orig/rpm_package.pm	2015-05-13 22:59:41.072239833 +0900
+++ pkgbuild-1.3.103/rpm_package.pm	2015-05-13 23:05:32.386645104 +0900
@@ -53,6 +53,13 @@
     my $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);
+        if ($line =~ /OmniOS.*r(\d+)/i) {
+            $os_build = $1;
+        }
+    }
     $self->{_tags}->{ips_vendor_version} = "0.$os_build";
     my $target = $$parent_spec_ref->{_defines}->{"_target"};
     if (defined $target) {