diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp
index d93de4d05..df6e13163 100644
--- a/qt-ui/mainwindow.cpp
+++ b/qt-ui/mainwindow.cpp
@@ -73,6 +73,10 @@ MainWindow::MainWindow() : QMainWindow(),
 	ui.ListWidget->scrollTo(ui.ListWidget->model()->index(0,0), QAbstractItemView::PositionAtCenter);
 	ui.divePlanner->settingsChanged();
 	ui.divePlannerWidget->settingsChanged();
+
+#ifndef ENABLE_PLANNER
+	ui.menuLog->removeAction(ui.actionDivePlanner);
+#endif
 }
 
 // this gets called after we download dives from a divecomputer
diff --git a/qt-ui/mainwindow.ui b/qt-ui/mainwindow.ui
index 5b1280c65..c04fc2044 100644
--- a/qt-ui/mainwindow.ui
+++ b/qt-ui/mainwindow.ui
@@ -614,6 +614,7 @@
      <string>&amp;Log</string>
     </property>
     <addaction name="actionAddDive"/>
+    <addaction name="actionDivePlanner"/>
     <addaction name="separator"/>
     <addaction name="actionRenumber"/>
     <addaction name="actionAutoGroup"/>
diff --git a/subsurface.pro b/subsurface.pro
index 148b40047..2c7875110 100644
--- a/subsurface.pro
+++ b/subsurface.pro
@@ -233,5 +233,10 @@ QMAKE_INFO_PLIST = packaging/macosx/Info.plist.in
 OTHER_FILES += $$DESKTOPFILE $$ICON $$MANPAGE $$XSLT_FILES $$DOC_FILES $$MARBLEDIR \
         $$QMAKE_INFO_PLIST
 
+# enable or disable the dive planner
+planner {
+	DEFINES += ENABLE_PLANNER
+}
+
 include(subsurface-gen-version.pri)
 include(subsurface-install.pri)