diff --git a/octave-2.9.15-pkg.patch b/octave-2.9.15-pkg.patch
new file mode 100644
index 0000000..6bffa62
--- /dev/null
+++ b/octave-2.9.15-pkg.patch
@@ -0,0 +1,21 @@
+Index: scripts/pkg/pkg.m
+===================================================================
+RCS file: /usr/local/cvsroot/octave/scripts/pkg/pkg.m,v
+retrieving revision 1.63
+retrieving revision 1.64
+diff -u -r1.63 -r1.64
+--- scripts/pkg/pkg.m	12 Oct 2007 21:27:23 -0000	1.63
++++ scripts/pkg/pkg.m	14 Oct 2007 19:28:42 -0000	1.64
+@@ -1095,7 +1095,11 @@
+     endif
+ 
+     ## Split into architecture dependent and independent files
+-    idx = cellfun (@(x) is_architecture_dependent (x), filenames);
++    if (isempty (filenames))
++      idx = [];
++    else
++      idx = cellfun (@(x) is_architecture_dependent (x), filenames);
++    endif
+     archdependent = filenames (idx);
+     archindependent = filenames (!idx);
+ 
diff --git a/octave.spec b/octave.spec
index da9db09..4d698bd 100644
--- a/octave.spec
+++ b/octave.spec
@@ -3,13 +3,14 @@
 
 Name:           octave
 Version:        2.9.15
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A high-level language for numerical computations
 Epoch:          6
 
 Group:          Applications/Engineering
 License:        GPLv2+
 Source:         ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-%{version}.tar.bz2
+Patch:          octave-2.9.15-pkg.patch
 URL:            http://www.octave.org
 Requires:       gnuplot less info texinfo 
 Requires(post): /sbin/install-info
@@ -53,6 +54,7 @@ applications which use GNU Octave.
 
 %prep
 %setup -q
+%patch -p0 -b .pkg
 # Check that octave_api is set correctly
 if ! grep -q '^#define OCTAVE_API_VERSION "%{octave_api}"' src/version.h
 then
@@ -140,6 +142,9 @@ fi
 
 
 %changelog
+* Tue Oct 16 2007 Orion Poplawski <orion@ora.nwra.com> 2.9.15-2
+- Updated pkg.m patch
+
 * Mon Oct 15 2007 Quentin Spencer <qspencer@users.sourceforge.net> 2.9.15-1
 - New release. Remove old patch.