diff --git a/src/gsad_gmp.c b/src/gsad_gmp.c
index d810e77f3..e69dccb94 100644
--- a/src/gsad_gmp.c
+++ b/src/gsad_gmp.c
@@ -19156,6 +19156,142 @@ get_agent_installer_instruction_gmp (
                        g_string_free (xml, FALSE), response_data);
 }
 
+/**
+ * @brief Get an agent support bundle.
+ *
+ * @param[in]  connection      Connection to manager.
+ * @param[in]  credentials     Credentials for authentication.
+ * @param[in]  params          Request parameters.
+ * @param[out] response_data   Extra data for the HTTP response.
+ *
+ * @return Enveloped XML object.
+ */
+char *
+get_agent_support_bundle_gmp (gvm_connection_t *connection,
+                              gsad_credentials_t *credentials, params_t *params,
+                              gsad_command_response_data_t *response_data)
+{
+  const gchar *agent_uuid = params_value (params, "agent_uuid");
+  const gchar *days = params_value (params, "days");
+  entity_t entity = NULL;
+  entity_t file_entity = NULL;
+  entity_t content_type_entity = NULL;
+  entity_t content_entity = NULL;
+  entity_t name_entity = NULL;
+  const gchar *name = NULL;
+  const gchar *content_type = NULL;
+  gchar *content = NULL;
+  gchar *content_decoded = NULL;
+  gsize content_length = 0;
+
+  CHECK_VARIABLE_INVALID (agent_uuid, "Get Agent Support Bundle");
+
+  if (days && strlen (days) > 0)
+    {
+      CHECK_VARIABLE_INVALID (days, "Get Agent Support Bundle");
+    }
+
+  if (days && strlen (days) > 0)
+    {
+      if (gvm_connection_sendf (
+            connection,
+            "<get_agent_support_bundle agent_uuid=\"%s\" days=\"%s\"/>",
+            agent_uuid, days)
+          == -1)
+        {
+          gsad_command_response_data_set_status_code (
+            response_data, MHD_HTTP_INTERNAL_SERVER_ERROR);
+          return gsad_http_create_gsad_message (
+            credentials,
+            "Failed to send GMP command to retrieve support bundle.",
+            response_data);
+        }
+    }
+  else if (gvm_connection_sendf (
+             connection, "<get_agent_support_bundle agent_uuid=\"%s\"/>",
+             agent_uuid)
+           == -1)
+    {
+      gsad_command_response_data_set_status_code (
+        response_data, MHD_HTTP_INTERNAL_SERVER_ERROR);
+      return gsad_http_create_gsad_message (
+        credentials, "Failed to send GMP command to retrieve support bundle.",
+        response_data);
+    }
+
+  if (read_entity_c (connection, &entity))
+    {
+      gsad_command_response_data_set_status_code (
+        response_data, MHD_HTTP_INTERNAL_SERVER_ERROR);
+      return gsad_http_create_gsad_message (
+        credentials, "Failed to receive support bundle response.",
+        response_data);
+    }
+
+  if (gmp_success (entity) != 1)
+    {
+      gchar *message;
+
+      set_http_status_from_entity (entity, response_data);
+
+      message = gsad_http_create_gsad_message (
+        credentials, entity_attribute (entity, "status_text"), response_data);
+      free_entity (entity);
+      return message;
+    }
+
+  file_entity = entity_child (entity, "file");
+
+  if (!file_entity || !entity_text (file_entity))
+    {
+      free_entity (entity);
+      gsad_command_response_data_set_status_code (
+        response_data, MHD_HTTP_INTERNAL_SERVER_ERROR);
+      return gsad_http_create_gsad_message (
+        credentials, "No agent support bundle content was returned.",
+        response_data);
+    }
+
+  name_entity = entity_child (file_entity, "name");
+  name = name_entity ? entity_text (name_entity) : NULL;
+
+  content_type_entity = entity_child (file_entity, "content_type");
+  content_type = content_type_entity ? entity_text (content_type_entity) : NULL;
+
+  content_entity = entity_child (file_entity, "content");
+  content = content_entity ? entity_text (content_entity) : "";
+
+  content_decoded = (gchar *) g_base64_decode (content, &content_length);
+
+  if (!content_decoded)
+    {
+      content_decoded = g_strdup ("");
+      content_length = 0;
+    }
+
+  if (!name || strlen (name) == 0)
+    name = "agent_support_bundle.tar.gz.enc";
+
+  if (!content_type || strlen (content_type) == 0)
+    {
+      gsad_command_response_data_set_content_type (
+        response_data, GSAD_CONTENT_TYPE_OCTET_STREAM);
+    }
+  else
+    {
+      gsad_command_response_data_set_content_type_string (
+        response_data, g_strdup (content_type));
+    }
+
+  gsad_command_response_data_set_content_disposition (
+    response_data, g_strdup_printf ("attachment; filename=\"%s\"", name));
+
+  gsad_command_response_data_set_content_length (response_data, content_length);
+
+  free_entity (entity);
+  return content_decoded;
+}
+
 /**
  * @brief Get one agent, envelope the result.
  *
@@ -21432,6 +21568,7 @@ exec_gmp_get (gsad_http_connection_t *con, gsad_connection_info_t *con_info,
   ELSE (export_web_application_target)
   ELSE (export_web_application_targets)
   ELSE (get_agent_installer_instruction)
+  ELSE (get_agent_support_bundle)
   ELSE (get_agent)
   ELSE (get_agents)
   ELSE (get_agent_group)
diff --git a/src/gsad_gmp.h b/src/gsad_gmp.h
index 34dac3fe8..25829c79d 100644
--- a/src/gsad_gmp.h
+++ b/src/gsad_gmp.h
@@ -866,6 +866,10 @@ get_agent_installer_instruction_gmp (gvm_connection_t *, gsad_credentials_t *,
                                      params_t *,
                                      gsad_command_response_data_t *);
 
+char *
+get_agent_support_bundle_gmp (gvm_connection_t *, gsad_credentials_t *,
+                              params_t *, gsad_command_response_data_t *);
+
 char *
 get_agent_gmp (gvm_connection_t *, gsad_credentials_t *, params_t *,
                gsad_command_response_data_t *);
diff --git a/src/gsad_validator.c b/src/gsad_validator.c
index 13f200745..40b674815 100644
--- a/src/gsad_validator.c
+++ b/src/gsad_validator.c
@@ -140,6 +140,7 @@ gsad_init_validator ()
                      "|(export_web_application_target)"
                      "|(export_web_application_targets)"
                      "|(get_agent_installer_instruction)"
+                     "|(get_agent_support_bundle)"
                      "|(get_agent)"
                      "|(get_agents)"
                      "|(get_agent_group)"
@@ -588,6 +589,7 @@ gsad_init_validator ()
   gvm_validator_alias (validator, "agent_control_id", "id");
   gvm_validator_alias (validator, "agent_group_id", "id");
   gvm_validator_alias (validator, "agent_ids:value", "id");
+  gvm_validator_alias (validator, "agent_uuid", "id");
   gvm_validator_alias (validator, "alert_id_2", "alert_id");
   gvm_validator_alias (validator, "alert_id", "id");
   gvm_validator_alias (validator, "config_id", "id");