diff -ur pkgbuild-1.3.104.orig/pkgdb.pm.in pkgbuild-1.3.104/pkgdb.pm.in
--- pkgbuild-1.3.104.orig/pkgdb.pm.in	2015-05-16 00:34:21.174345523 +0900
+++ pkgbuild-1.3.104/pkgdb.pm.in	2015-05-16 09:16:26.368795234 +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.104.orig/pkgtool.pl pkgbuild-1.3.104/pkgtool.pl
--- pkgbuild-1.3.104.orig/pkgtool.pl	2015-05-16 00:34:21.175224128 +0900
+++ pkgbuild-1.3.104/pkgtool.pl	2015-05-16 09:12:34.924153729 +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.104.orig/rpm_package.pm pkgbuild-1.3.104/rpm_package.pm
--- pkgbuild-1.3.104.orig/rpm_package.pm	2015-05-16 00:34:21.174880420 +0900
+++ pkgbuild-1.3.104/rpm_package.pm	2015-05-16 09:13:13.781411324 +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);
+	}
     }
     $self->{_tags}->{ips_vendor_version} = "0.$os_build";
     my $target = $$parent_spec_ref->{_defines}->{"_target_cpu"};