diff --git a/src/app/qgsmapsavedialog.cpp b/src/app/qgsmapsavedialog.cpp
index 47fe4d747098..d285d332e0a5 100644
--- a/src/app/qgsmapsavedialog.cpp
+++ b/src/app/qgsmapsavedialog.cpp
@@ -26,6 +26,7 @@
 #include <QSpinBox>
 
 #include "qgsmapsavedialog.h"
+#include "qgsabstractgeopdfexporter.h"
 #include "qgsguiutils.h"
 #include "qgis.h"
 #include "qgisapp.h"
@@ -117,11 +118,25 @@ QgsMapSaveDialog::QgsMapSaveDialog( QWidget *parent, QgsMapCanvas *mapCanvas, co
       mSaveAsRaster->setVisible( true );
 
       this->setWindowTitle( tr( "Save Map as PDF" ) );
+
+      const bool geoPdfAvailable = QgsAbstractGeoPdfExporter::geoPDFCreationAvailable();
+      mGeoPDFGroupBox->setEnabled( geoPdfAvailable );
+      if ( !geoPdfAvailable )
+      {
+        mGeoPDFGroupBox->setChecked( false );
+        mGeoPDFOptionsStackedWidget->setCurrentIndex( 0 );
+        mGeoPdfUnavailableReason->setText( mGeoPdfUnavailableReason::geoPDFAvailabilityExplanation() );
+      }
+      else
+      {
+        mGeoPDFOptionsStackedWidget->setCurrentIndex( 1 );
+      }
       break;
     }
 
     case Image:
     {
+      mGeoPDFGroupBox->hide();
       QPushButton *button = new QPushButton( tr( "Copy to Clipboard" ) );
       buttonBox->addButton( button, QDialogButtonBox::ResetRole );
       connect( button, &QPushButton::clicked, this, &QgsMapSaveDialog::copyToClipboard );
@@ -457,7 +472,7 @@ void QgsMapSaveDialog::onAccepted()
         QgsMapSettings ms = QgsMapSettings();
         applyMapSettings( ms );
 
-        QgsMapRendererTask *mapRendererTask = new QgsMapRendererTask( ms, fileName, QStringLiteral( "PDF" ), saveAsRaster() );
+        QgsMapRendererTask *mapRendererTask = new QgsMapRendererTask( ms, fileName, QStringLiteral( "PDF" ), saveAsRaster(), mGeoPDFGroupBox->isChecked() );
 
         if ( drawAnnotations() )
         {
diff --git a/src/ui/qgsmapsavedialog.ui b/src/ui/qgsmapsavedialog.ui
index a51fa1e2de09..7a04c43a7542 100644
--- a/src/ui/qgsmapsavedialog.ui
+++ b/src/ui/qgsmapsavedialog.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>600</width>
-    <height>318</height>
+    <height>439</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -16,27 +16,10 @@
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <layout class="QGridLayout" name="gridLayout">
-     <item row="9" column="0" colspan="2">
-      <widget class="QLabel" name="mInfo">
-       <property name="enabled">
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-     <item row="8" column="0" colspan="2">
-      <widget class="QCheckBox" name="mSaveAsRaster">
-       <property name="visible">
-        <bool>false</bool>
-       </property>
-       <property name="toolTip">
-        <string>Advanced effects such as blend modes or vector layer transparency cannot be exported as vectors.
-Rasterizing the map is recommended when such effects are used.</string>
-       </property>
+     <item row="2" column="0">
+      <widget class="QLabel" name="label_2">
        <property name="text">
-        <string>Rasterize map</string>
-       </property>
-       <property name="checked">
-        <bool>false</bool>
+        <string>Resolution</string>
        </property>
       </widget>
      </item>
@@ -50,6 +33,23 @@ Rasterizing the map is recommended when such effects are used.</string>
        </property>
       </widget>
      </item>
+     <item row="1" column="1">
+      <widget class="QgsScaleWidget" name="mScaleWidget" native="true"/>
+     </item>
+     <item row="0" column="0" colspan="2">
+      <widget class="QgsExtentGroupBox" name="mExtentGroupBox">
+       <property name="title">
+        <string>Extent</string>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="0">
+      <widget class="QLabel" name="label_4">
+       <property name="text">
+        <string>Output height</string>
+       </property>
+      </widget>
+     </item>
      <item row="6" column="0" colspan="2">
       <widget class="QCheckBox" name="mDrawAnnotations">
        <property name="text">
@@ -70,17 +70,27 @@ Rasterizing the map is recommended when such effects are used.</string>
        </property>
       </widget>
      </item>
-     <item row="4" column="0">
-      <widget class="QLabel" name="label_4">
+     <item row="3" column="0">
+      <widget class="QLabel" name="label_3">
        <property name="text">
-        <string>Output height</string>
+        <string>Output width</string>
        </property>
       </widget>
      </item>
-     <item row="3" column="0">
-      <widget class="QLabel" name="label_3">
+     <item row="9" column="0" colspan="2">
+      <widget class="QCheckBox" name="mSaveAsRaster">
+       <property name="visible">
+        <bool>false</bool>
+       </property>
+       <property name="toolTip">
+        <string>Advanced effects such as blend modes or vector layer transparency cannot be exported as vectors.
+Rasterizing the map is recommended when such effects are used.</string>
+       </property>
        <property name="text">
-        <string>Output width</string>
+        <string>Rasterize map</string>
+       </property>
+       <property name="checked">
+        <bool>false</bool>
        </property>
       </widget>
      </item>
@@ -170,13 +180,6 @@ Rasterizing the map is recommended when such effects are used.</string>
        </item>
       </layout>
      </item>
-     <item row="2" column="0">
-      <widget class="QLabel" name="label_2">
-       <property name="text">
-        <string>Resolution</string>
-       </property>
-      </widget>
-     </item>
      <item row="2" column="1">
       <widget class="QgsSpinBox" name="mResolutionSpinBox">
        <property name="suffix">
@@ -203,14 +206,57 @@ Rasterizing the map is recommended when such effects are used.</string>
        </property>
       </widget>
      </item>
-     <item row="1" column="1">
-      <widget class="QgsScaleWidget" name="mScaleWidget" native="true"/>
+     <item row="10" column="0" colspan="2">
+      <widget class="QLabel" name="mInfo">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+      </widget>
      </item>
-     <item row="0" column="0" colspan="2">
-      <widget class="QgsExtentGroupBox" name="mExtentGroupBox">
+     <item row="8" column="0" colspan="2">
+      <widget class="QGroupBox" name="mGeoPDFGroupBox">
        <property name="title">
-        <string>Extent</string>
+        <string>Create Geospatial PDF (GeoPDF)</string>
+       </property>
+       <property name="checkable">
+        <bool>true</bool>
        </property>
+       <property name="checked">
+        <bool>false</bool>
+       </property>
+       <layout class="QVBoxLayout" name="verticalLayout_2">
+        <item>
+         <widget class="QStackedWidget" name="mGeoPDFOptionsStackedWidget">
+          <property name="currentIndex">
+           <number>1</number>
+          </property>
+          <widget class="QWidget" name="page">
+           <layout class="QVBoxLayout" name="verticalLayout_3">
+            <property name="leftMargin">
+             <number>0</number>
+            </property>
+            <property name="topMargin">
+             <number>0</number>
+            </property>
+            <property name="rightMargin">
+             <number>0</number>
+            </property>
+            <property name="bottomMargin">
+             <number>0</number>
+            </property>
+            <item>
+             <widget class="QLabel" name="mGeoPdfUnavailableReason">
+              <property name="text">
+               <string/>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </widget>
+          <widget class="QWidget" name="page_2"/>
+         </widget>
+        </item>
+       </layout>
       </widget>
      </item>
     </layout>