diff --git a/TODO.md b/TODO.md
index 6d2a15b..39adb36 100644
--- a/TODO.md
+++ b/TODO.md
@@ -48,7 +48,6 @@
 - Standard ML of New Jersey
 - PyQt for Python
 - Oracle VM VirtualBox
-- Octave
 - NetBeans IDE
 - MySQL Workbench CE
 - Microsoft Web Deploy
diff --git a/roles/classroom/tasks/main.yml b/roles/classroom/tasks/main.yml
index 87a7b67..8ce4471 100644
--- a/roles/classroom/tasks/main.yml
+++ b/roles/classroom/tasks/main.yml
@@ -9,6 +9,7 @@
 - import_tasks: gimp.yml
 - import_tasks: git.yml
 - import_tasks: notepad++.yml
+- import_tasks: octave.yml
 - import_tasks: openjdk.yml
 - import_tasks: orange.yml
 - import_tasks: pelles-c.yml
diff --git a/roles/classroom/tasks/octave.yml b/roles/classroom/tasks/octave.yml
new file mode 100644
index 0000000..cf4f93c
--- /dev/null
+++ b/roles/classroom/tasks/octave.yml
@@ -0,0 +1,10 @@
+# chocolatey package is broken
+- name: Set Octave version
+  set_fact:
+    target_version: "7.2.0"
+
+- name: Install Octave
+  win_package:
+    path: https://ftpmirror.gnu.org/octave/windows/octave-{{ target_version }}-w64-installer.exe
+    arguments: /S /AllUsers
+    creates_path: C:\Program Files\GNU Octave\Octave-{{ target_version }}