diff -rupN GeographicLib-1.48/matlab/CMakeLists.txt GeographicLib-1.48-new/matlab/CMakeLists.txt
--- GeographicLib-1.48/matlab/CMakeLists.txt	2017-04-09 14:48:27.000000000 +0200
+++ GeographicLib-1.48-new/matlab/CMakeLists.txt	2017-06-05 15:34:30.499785438 +0200
@@ -1,17 +1,24 @@
+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)
-install (FILES ${LEGACY_FILES}
-  DESTINATION ${INSTALL_MATLAB_DIR}/geographiclib-legacy)
+if (INSTALL_LEGACY_MATLAB)
+  file (GLOB LEGACY_FILES geographiclib-legacy/[A-Za-z]*.m)
+  install (FILES ${LEGACY_FILES}
+    DESTINATION ${INSTALL_MATLAB_DIR}/geographiclib-legacy-${PROJECT_VERSION})
+endif()
diff -rupN GeographicLib-1.48/matlab/geographiclib/packinfo/DESCRIPTION GeographicLib-1.48-new/matlab/geographiclib/packinfo/DESCRIPTION
--- GeographicLib-1.48/matlab/geographiclib/packinfo/DESCRIPTION	1970-01-01 01:00:00.000000000 +0100
+++ GeographicLib-1.48-new/matlab/geographiclib/packinfo/DESCRIPTION	2017-06-05 15:33:44.484860569 +0200
@@ -0,0 +1,15 @@
+Name: geographiclib
+Version: 1.43
+Date: 2015-05-22
+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