diff --git a/.gitignore b/.gitignore
index 4652229..c5a5f8f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /GeographicLib-1.38.tar.gz
 /GeographicLib-1.40.tar.gz
+/GeographicLib-1.42.tar.gz
diff --git a/GeographicLib-1.38-cmakeinstall.patch b/GeographicLib-1.38-cmakeinstall.patch
deleted file mode 100644
index de5cfc7..0000000
--- a/GeographicLib-1.38-cmakeinstall.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up ./cmake/CMakeLists.txt.cmakeinstall ./cmake/CMakeLists.txt
---- ./cmake/CMakeLists.txt.cmakeinstall	2014-10-04 10:30:05.169120585 -0400
-+++ ./cmake/CMakeLists.txt	2014-10-04 10:30:21.803740426 -0400
-@@ -21,7 +21,7 @@ export (TARGETS ${PROJECT_SHARED_LIBRARI
- # path to the root from there.  (Note that the whole install tree can
- # be relocated.)
- if (COMMON_INSTALL_PATH)
--  set (INSTALL_CMAKE_DIR "share/cmake/${PROJECT_NAME}")
-+  set (INSTALL_CMAKE_DIR "share/${PROJECT_NAME}/cmake")
-   set (PROJECT_ROOT_DIR "../../..")
- else ()
-   set (INSTALL_CMAKE_DIR "cmake")
diff --git a/GeographicLib-1.40-rpath.patch b/GeographicLib-1.40-rpath.patch
deleted file mode 100644
index 4973874..0000000
--- a/GeographicLib-1.40-rpath.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -up ./CMakeLists.txt.rpath ./CMakeLists.txt
---- ./CMakeLists.txt.rpath	2015-01-02 12:59:41.732969161 -0500
-+++ ./CMakeLists.txt	2015-01-02 13:01:32.598240378 -0500
-@@ -210,7 +210,10 @@ if (MSVC OR CMAKE_CONFIGURATION_TYPES)
-   set (CMAKE_DEBUG_POSTFIX _d)
- endif ()
- 
--if (NOT MSVC)
-+option (USE_RPATH 
-+  "Include rpath in installed binaries" ON)
-+
-+if (NOT MSVC AND USE_RPATH)
-   # Set the run time path for shared libraries for non-Windows machines.
-   # (1) include link path for external packages (not needed with
-   # GeographicLib because there are no external packages).  This only
diff --git a/GeographicLib-1.42-octave.patch b/GeographicLib-1.42-octave.patch
new file mode 100644
index 0000000..d425e35
--- /dev/null
+++ b/GeographicLib-1.42-octave.patch
@@ -0,0 +1,55 @@
+diff -up ./matlab/CMakeLists.txt.octave ./matlab/CMakeLists.txt
+--- ./matlab/CMakeLists.txt.octave	2015-04-28 00:07:14.000000000 -0400
++++ ./matlab/CMakeLists.txt	2015-05-17 11:22:21.355846289 -0400
+@@ -1,18 +1,25 @@
++option(INSTALL_LEGACY_MATLAB "Install deprecated legacy MATLAB routines" FALSE)
+ # Install matlab files.
+ if (COMMON_INSTALL_PATH)
+   # More Octave friendly would be "share/octave/site/m"
+-  set (INSTALL_MATLAB_DIR "share/matlab")
++  set (INSTALL_MATLAB_DIR "share/octave/packages")
+ else ()
+   set (INSTALL_MATLAB_DIR "matlab")
+ endif ()
+ file (GLOB MATLAB_FILES geographiclib/[A-Za-z]*.m)
+-install (FILES ${MATLAB_FILES} DESTINATION ${INSTALL_MATLAB_DIR}/geographiclib)
++install (FILES ${MATLAB_FILES} DESTINATION ${INSTALL_MATLAB_DIR}/geographiclib-${PROJECT_VERSION})
++install (FILES geographiclib/packinfo/DESCRIPTION DESTINATION ${INSTALL_MATLAB_DIR}/geographiclib-${PROJECT_VERSION}/packinfo)
+ # Install "private" functions
+ file (GLOB PRIVATE_MATLAB_FILES geographiclib/private/[A-Za-z]*.m)
+ install (FILES ${PRIVATE_MATLAB_FILES}
+-  DESTINATION ${INSTALL_MATLAB_DIR}/geographiclib/private)
++  DESTINATION ${INSTALL_MATLAB_DIR}/geographiclib-${PROJECT_VERSION}/private)
++install (FILES ${PROJECT_SOURCE_DIR}/LICENSE.txt
++  DESTINATION ${INSTALL_MATLAB_DIR}/geographiclib-${PROJECT_VERSION}/packinfo
++  RENAME "COPYING")
+ # Install "legacy" functions
+-file (GLOB LEGACY_FILES
+-  geographiclib-legacy/[A-Za-z]*.m  geographiclib-legacy/[A-Za-z]*.cpp)
+-install (FILES ${LEGACY_FILES}
+-  DESTINATION ${INSTALL_MATLAB_DIR}/geographiclib-legacy)
++if (INSTALL_LEGACY_MATLAB)
++  file (GLOB LEGACY_FILES
++    geographiclib-legacy/[A-Za-z]*.m  geographiclib-legacy/[A-Za-z]*.cpp)
++  install (FILES ${LEGACY_FILES} 
++    DESTINATION ${INSTALL_MATLAB_DIR}/geographiclib-legacy-${PROJECT_VERSION})
++endif()
+diff -up ./matlab/geographiclib/packinfo/DESCRIPTION.octave ./matlab/geographiclib/packinfo/DESCRIPTION
+--- ./matlab/geographiclib/packinfo/DESCRIPTION.octave	2015-05-17 11:17:23.793165688 -0400
++++ ./matlab/geographiclib/packinfo/DESCRIPTION	2015-05-17 11:17:23.793165688 -0400
+@@ -0,0 +1,15 @@
++Name: geographiclib
++Version: 1.42
++Date: 2015-04-27
++Author: Charles Karney <charles@karney.com>
++Maintainer: Rich Mattes <richmattes@gmail.com>
++Title: Octave implemtation of GeographicLib
++Description: This toolbox provides native MATLAB implementations of a subset of the
++ C++ library, GeographicLib.  Key components of this toolbox are
++ * Geodesics, direct, inverse, area calculations.
++ * Projections, transverse Mercator, polar stereographic, etc.
++ * Grid systems, UTM, UPS, MGRS.
++ * Geoid lookup, egm84, egm96, egm2008 geoids supported.
++ * Geometric transformations, geocentric, local cartesian.
++ * Great ellipse, direct, inverse, area calculations.
++Url: http://geographiclib.sf.net/html
diff --git a/GeographicLib.spec b/GeographicLib.spec
index 9a8c380..567148b 100644
--- a/GeographicLib.spec
+++ b/GeographicLib.spec
@@ -1,6 +1,6 @@
 Name:           GeographicLib
-Version:        1.40
-Release:        2%{?dist}
+Version:        1.42
+Release:        1%{?dist}
 Summary:        Library for geographic coordinate transformations 
 
 License:        MIT
@@ -8,14 +8,11 @@ URL:            http://geographiclib.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/geographiclib/%{name}-%{version}.tar.gz 
 # Use PythonInterp to set the python version for installation directory,
 # and install python lib to arch-independent path
-# Not submitted upstream
+# Not yet submitted upstream
 Patch0:         %{name}-1.37-python.patch
-# Add an option to disable rpath on installed binaries
-# Not submitted upstream
-Patch1:         %{name}-1.40-rpath.patch
-# Install cmake files to datadir/prooject/cmake
-# Not submitted upstream
-Patch2:         %{name}-1.38-cmakeinstall.patch
+# Bundle MATLAB scripts into octave patckages
+# Not yet submitted upstream
+Patch1:         %{name}-1.42-octave.patch
 
 BuildRequires:  cmake
 BuildRequires:  doxygen
@@ -57,11 +54,21 @@ BuildArch: noarch
 %description -n python-%{name}
 A translation of the GeographicLib::Geodesic class to Python
 
+%package -n octave-%{name}
+Summary:   Octave implementation of %{name}
+BuildArch: noarch
+BuildRequires:    octave-devel
+Requires:         octave >= 3.4
+Requires(post):   octave
+Requires(postun): octave 
+
+%description -n octave-%{name}
+A translation of some of the GeographicLib C++ functionality to Octave
+
 %prep
 %setup -q
 %patch0 -p0 -b .python
-%patch1 -p0 -b .rpath
-%patch2 -p0 -b .cmakeinstall
+%patch1 -p0 -b .octave
 
 %build
 mkdir build; pushd build;
@@ -69,7 +76,8 @@ mkdir build; pushd build;
   -DGEOGRAPHICLIB_DATA="%{_datadir}/%{name}" \
   -DCOMMON_INSTALL_PATH=ON \
   -DGEOGRAPHICLIB_DOCUMENTATION=ON \
-  -DUSE_RPATH=OFF
+  -DUSE_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=ON
 popd
 make -C build %{?_smp_mflags}
 
@@ -81,6 +89,8 @@ rm -f %{buildroot}/%{_libdir}/*.a
 rm -rf %{buildroot}/%{_datadir}/doc
 rm -rf %{buildroot}/%{_libexecdir}
 
+mkdir -p %{buildroot}%{_datadir}/%{name}
+
 %check
 make -C build test
 
@@ -88,9 +98,19 @@ make -C build test
 
 %postun -p /sbin/ldconfig
 
+%post -n octave-%{name}
+%octave_cmd pkg rebuild
+
+%preun -n octave-%{name}
+%octave_pkg_preun
+
+%postun -n octave-%{name}
+%octave_cmd pkg rebuild
+
+
 %files
 %doc AUTHORS LICENSE.txt NEWS
-%dir %{_datadir}/%{name}
+%{_datadir}/%{name}
 %{_bindir}/*
 %{_sbindir}/*
 %{_libdir}/*.so.*
@@ -100,7 +120,7 @@ make -C build test
 %files devel
 %{_includedir}/%{name}
 %{_libdir}/*.so
-%{_datadir}/%{name}/cmake
+%{_libdir}/cmake
 
 %files doc
 %doc LICENSE.txt build/doc/html
@@ -109,7 +129,14 @@ make -C build test
 %doc LICENSE.txt
 %{python_sitelib}/geographiclib
 
+%files -n octave-%{name}
+%{_datadir}/octave/packages/*
+
 %changelog
+* Mon May 04 2015 Rich Mattes <richmattes@gmail.com> - 1.42-1
+- Update to release 1.42
+- Add octave subpackage
+
 * Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 1.40-2
 - Rebuilt for GCC 5 C++11 ABI change
 
diff --git a/sources b/sources
index c2fc568..9a2c19b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-082ab1299c3c2484883b8e88007e90e9  GeographicLib-1.40.tar.gz
+114a334765b9c416a2de3dfc72c22d6d  GeographicLib-1.42.tar.gz