diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 8ef9a5c277850ba8e3e7c0c6af6dd5e5d51d6ea3..308501f882ebd566ea1030cee8055ffe27b2d2b3 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -1709,7 +1709,7 @@ (define-public qucs
          ("gcc-toolchain" ,gcc-toolchain)
          ("iverilog" ,iverilog)
          ("libtool" ,libtool)
-         ("octave" ,octave)
+         ("octave" ,octave-cli)
          ("qt4" ,qt-4)
          ("sed" ,sed)))
       (home-page "http://qucs.sourceforge.net/")
@@ -1839,7 +1839,7 @@ (define-public qucs-s
        ("libtool" ,libtool)
        ("mpi" ,openmpi)
        ("ngspice" ,ngspice)
-       ("octave" ,octave)
+       ("octave" ,octave-cli)
        ("qt4" ,qt-4)
        ("qucs" ,qucs)
        ("sed" ,sed)
diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index 3f525e39a5ff7ff54369d3b9f1a0154c49ae29d9..084e62cca4fb077800c7bf6979a75088c261c00f 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -495,7 +495,7 @@ (define (delete-ifdefs file)
      `(("python" ,python)
        ("numpy" ,python-numpy)
        ("r-minimal" ,r-minimal)
-       ("octave" ,octave)
+       ("octave" ,octave-cli)
        ("swig" ,swig)
        ("eigen" ,eigen)
        ("hdf5" ,hdf5)
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index f88cede68a75724956934c4d7fd45ec8f8ec8622..e2f3e662c7d7e91497309428ac1f759e8be3c8dd 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -1413,9 +1413,9 @@ (define-public ceres
 
 ;; For a fully featured Octave, users are strongly recommended also to install
 ;; the following packages: less, ghostscript, gnuplot.
-(define-public octave
+(define-public octave-cli
   (package
-    (name "octave")
+    (name "octave-cli")
     (version "4.4.1")
     (source
      (origin
@@ -1498,20 +1498,20 @@ (define-public octave
     (license license:gpl3+)))
 
 (define-public qtoctave
-  (package (inherit octave)
+  (package (inherit octave-cli)
     (name "qtoctave")
     (source (origin
-              (inherit (package-source octave))))
+              (inherit (package-source octave-cli))))
     (inputs
      `(("qscintilla" ,qscintilla)
        ("qt" ,qtbase)
-       ,@(package-inputs octave)))
+       ,@(package-inputs octave-cli)))
     (native-inputs
      `(("qttools" , qttools) ;for lrelease
        ("texlive" ,texlive) ;for texi2dvi
-       ,@(package-native-inputs octave)))
+       ,@(package-native-inputs octave-cli)))
     (arguments
-     (substitute-keyword-arguments (package-arguments octave)
+     (substitute-keyword-arguments (package-arguments octave-cli)
        ((#:phases phases)
         `(modify-phases ,phases
            (add-before 'configure 'patch-qscintilla-library-name
@@ -3580,7 +3580,7 @@ (define-public flann
      `(("unzip" ,unzip)))
     (inputs
      `(("hdf5" ,hdf5)
-       ("octave" ,octave)
+       ("octave" ,octave-cli)
        ("python" ,python-2) ; print syntax
        ;; ("python2-numpy" ,python2-numpy) ; only required for the tests
        ("zlib" ,zlib)))