diff --git a/docs/manual/manual.adoc b/docs/manual/manual.adoc
index 686e5f78f4..4fabe6be64 100644
--- a/docs/manual/manual.adoc
+++ b/docs/manual/manual.adoc
@@ -1120,6 +1120,57 @@ For example, to generate a blueprint remediation for RHEL 8 OSPP profile, run:
 $ oscap xccdf generate fix --profile ospp --fix-type blueprint /usr/share/xml/scap/ssg/content/ssg-rhel8-ds.xml > blueprint.toml
 ----
 
+=== Generating RHEL Kickstarts
+
+OpenSCAP can generate RHEL kickstarts which can be used for unattended installation of RHEL, Fedora and similar systems.
+Information about RHEL kickstarts and their syntax can be found at https://docs.redhat.com/en/documentation/red_hat_enterprise_linux/9/html/performing_an_advanced_rhel_9_installation/kickstart_references[Kickstart references] and https://pykickstart.readthedocs.io/en/latest/kickstart-docs.html[Kickstart Documentation].
+
+To generate a kickstart, use `oscap xccdf generate fix` command with the `--fix-type kickstart` option.
+
+The kickstart will be generated from kickstart snippets in XCCDF rules in the input SCAP content.
+The kickstart snippets need to be present in `<fix>` elements with `system` attribute set to `urn:xccdf:fix:script:kickstart`.
+
+When processing the kickstart snippets from the XCCDF Rules, each line is processed separately.
+If a line starts with a supported block keyword, that line and all following lines until a line starting with `%end` are considered a block.
+Blocks are propagated to the output without any processing.
+If a line isn't part of a block, the following rules are applied:
+
+* Lines starting with `#` are ignored.
+* Empty lines are ignored.
+* Lines starting with a supported command are processed.
+* Lines starting with something else than a supported command are dropped and error is produced.
+* Excess whitespace are trimmed.
+
+Supported block keywords:
+
+* `%pre` - represents a start of a `%pre` kickstart section, all lines until corresponding '%end' are overthrown
+* `%post` - represents a start of a `%post` kickstart section, all lines until corresponding '%end' are overthrown
+
+Supported commands:
+
+* `package install package_name` - adds `package_name` to `%packages` section in the kickstart
+* `package remove package_name` - adds `-package_name` to `%packages` section in the kickstart
+* `service enable service_name` - adds `service_name` to list in the `--enabled=` option in the `services` command in commands section in the kickstart
+* `service disable service_name` - adds `service_name` to list in the `--disabled=` option in the `services` command in commands section in the kickstart
+* `logvol path size` - adds `logvol` entry to the commands section of the kickstart that will mount a partition of the given `size` in MB to the given `path` as a mount point
+* `bootloader option` or `bootloader option=value` - adds `option` or `option=value` to the list in the `--append=` option in the `bootloader` command in commands section in the kickstart
+* `kdump disable` - this will disable K-Dump by adding the `com_redhat_kdump` Addon section to the kickstart with a `--disable` option
+
+For example, to generate a kickstart for RHEL 9 STIG profile, run:
+
+----
+$ oscap xccdf generate fix --profile stig --fix-type kickstart /usr/share/xml/scap/ssg/content/ssg-rhel9-ds.xml > rhel9-kickstart-stig.cfg
+----
+
+The generated kickstart file needs to be reviewed and customized for the intended deployment.
+The kickstart sets some default values to makte automated installation possible.
+These default values are usually good enough but sometimes need to be changed manually.
+Pay special attention to the items marked as `required for security compliance`.
+
+NOTE: The `kickstart` fix type shouldn't be confused with `anaconda` fix type.
+The `anaconda` fix type is used by the OSCAP Anaconda Addon and shouldn't be used directly by users.
+Users should use the `kickstart` fix type.
+
 == Details on SCAP conformance
 
 === Check Engines
@@ -2095,3 +2146,10 @@ You can find the ID of the customized profile with `oscap info <your_tailoring_f
 Yes, it's possible, you can download the file on other computer that is connected to the internet and then copy the file to the system where you run `oscap`.
 Instead of the `--fetch-remote-resources` option you will use the `--local-files` option.
 For more information, please refer to section <<_using_external_or_remote_resources,Using external or remote resources>>.
+
+*I have generated a kickstart but the generated file isn't a valid kickstart.*
+
+You are using a wrong `--fix-type` option.
+To generate a kickstart, use the `--fix-type kickstart` option.
+Do not use `--fix-type anaconda`.
+For more information, please refer to section <<_generating_rhel_kickstarts,Generating RHEL Kickstarts>>.
diff --git a/src/XCCDF/public/xccdf_session.h b/src/XCCDF/public/xccdf_session.h
index fbadeccd2e..7987c7d07e 100644
--- a/src/XCCDF/public/xccdf_session.h
+++ b/src/XCCDF/public/xccdf_session.h
@@ -240,6 +240,8 @@ OSCAP_API void xccdf_session_set_user_cpe(struct xccdf_session *session, const c
  */
 OSCAP_API void xccdf_session_set_user_tailoring_file(struct xccdf_session *session, const char *user_tailoring_file);
 
+OSCAP_API struct oscap_source *xccdf_session_get_user_tailoring_file(struct xccdf_session *session);
+
 /**
  * Set ID of Tailoring component for the session. This function is applicable
  * only before session loads. It has no effect if run afterwards.
diff --git a/src/XCCDF/xccdf_session.c b/src/XCCDF/xccdf_session.c
index 5ec127be68..a2fd8cd544 100644
--- a/src/XCCDF/xccdf_session.c
+++ b/src/XCCDF/xccdf_session.c
@@ -502,6 +502,11 @@ void xccdf_session_set_user_tailoring_file(struct xccdf_session *session, const
 		oscap_source_new_from_file(user_tailoring_file) : NULL;
 }
 
+struct oscap_source *xccdf_session_get_user_tailoring_file(struct xccdf_session *session)
+{
+	return session->tailoring.user_file;
+}
+
 void xccdf_session_set_user_tailoring_cid(struct xccdf_session *session, const char *user_tailoring_cid)
 {
 	free(session->tailoring.user_component_id);
diff --git a/src/XCCDF_POLICY/public/xccdf_policy.h b/src/XCCDF_POLICY/public/xccdf_policy.h
index 85bedd0f1c..9cdde59a17 100644
--- a/src/XCCDF_POLICY/public/xccdf_policy.h
+++ b/src/XCCDF_POLICY/public/xccdf_policy.h
@@ -515,10 +515,12 @@ OSCAP_API bool xccdf_policy_resolve(struct xccdf_policy * policy);
  * @param result XCCDF TestResult. This may be omitted to generate the prescription
  * based solely on the XCCDF Policy (xccdf:Profile).
  * @param sys Consider only those fixes that have @system attribute equal to sys
+ * @param input_file_name file name of the input SCAP file
+ * @param tailoring input tailoring file (parsed as oscap source)
  * @param output_fd write prescription to this file descriptor
  * @returns zero on success, non-zero indicate partial (incomplete) output.
  */
-OSCAP_API int xccdf_policy_generate_fix(struct xccdf_policy *policy, struct xccdf_result *result, const char *sys, int output_fd);
+OSCAP_API int xccdf_policy_generate_fix(struct xccdf_policy *policy, struct xccdf_result *result, const char *sys, const char *input_file_name, struct oscap_source *tailoring, int output_fd);
 
 /**
  * xccdf_policy_model_get_files and xccdf_item_get_files each return oscap_file_entries instead of raw strings
diff --git a/src/XCCDF_POLICY/xccdf_policy_remediate.c b/src/XCCDF_POLICY/xccdf_policy_remediate.c
index 8c2aaf98c9..c67bb9cab3 100644
--- a/src/XCCDF_POLICY/xccdf_policy_remediate.c
+++ b/src/XCCDF_POLICY/xccdf_policy_remediate.c
@@ -49,6 +49,23 @@
 #include "public/xccdf_policy.h"
 #include "oscap_helpers.h"
 
+struct kickstart_commands {
+	struct oscap_list *package_install;
+	struct oscap_list *package_remove;
+	struct oscap_list *service_enable;
+	struct oscap_list *service_disable;
+	struct oscap_list *pre;
+	struct oscap_list *post;
+	struct oscap_list *logvol;
+	struct oscap_list *bootloader;
+	bool enable_kdump;
+};
+
+struct logvol_cmd {
+	char *path;
+	char *size;
+};
+
 static int _rule_add_info_message(struct xccdf_rule_result *rr, ...)
 {
 	va_list ap;
@@ -893,6 +910,191 @@ static int _xccdf_policy_rule_generate_blueprint_fix(struct xccdf_policy *policy
 	return ret;
 }
 
+static int _parse_line(const char *line, struct kickstart_commands *cmds)
+{
+	int ret = 0;
+	char *dup = strdup(line);
+	char **words = oscap_split(dup, " ");
+	enum states {
+		KS_START,
+		KS_PACKAGE,
+		KS_PACKAGE_INSTALL,
+		KS_PACKAGE_REMOVE,
+		KS_SERVICE,
+		KS_SERVICE_ENABLE,
+		KS_SERVICE_DISABLE,
+		KS_LOGVOL,
+		KS_LOGVOL_SIZE,
+		KS_BOOTLOADER,
+		KS_KDUMP,
+		KS_ERROR
+	};
+	int state = KS_START;
+	struct logvol_cmd *current_logvol_cmd = NULL;
+	for (unsigned int i = 0; words[i] != NULL; i++) {
+		char *word = oscap_trim(words[i]);
+		if (*word == '\0')
+			continue;
+		switch (state) {
+		case KS_START:
+			if (!strcmp(word, "package")) {
+				state = KS_PACKAGE;
+			} else if (!strcmp(word, "service")) {
+				state = KS_SERVICE;
+			} else if (!strcmp(word, "logvol")) {
+				state = KS_LOGVOL;
+			} else if (!strcmp(word, "bootloader")) {
+				state = KS_BOOTLOADER;
+			} else if (!strcmp(word, "kdump")) {
+				state = KS_KDUMP;
+			} else {
+				ret = 1;
+				oscap_seterr(OSCAP_EFAMILY_OSCAP, "Unsupported command keyword '%s' in command: '%s'", word, line);
+				goto cleanup;
+			}
+			break;
+		case KS_PACKAGE:
+			if (!strcmp(word, "install")) {
+				state = KS_PACKAGE_INSTALL;
+			} else if (!strcmp(word, "remove")) {
+				state = KS_PACKAGE_REMOVE;
+			} else {
+				ret = 1;
+				oscap_seterr(OSCAP_EFAMILY_OSCAP, "Unsupported 'package' command keyword '%s' in command:'%s'", word, line);
+				goto cleanup;
+			}
+			break;
+		case KS_PACKAGE_INSTALL:
+			oscap_list_add(cmds->package_install, strdup(word));
+			break;
+		case KS_PACKAGE_REMOVE:
+			oscap_list_add(cmds->package_remove, strdup(word));
+			break;
+		case KS_SERVICE:
+			if (!strcmp(word, "enable")) {
+				state = KS_SERVICE_ENABLE;
+			} else if (!strcmp(word, "disable")) {
+				state = KS_SERVICE_DISABLE;
+			} else {
+				ret = 1;
+				oscap_seterr(OSCAP_EFAMILY_OSCAP, "Unsupported 'service' command keyword '%s' in command: '%s'", word, line);
+				goto cleanup;
+			}
+			break;
+		case KS_SERVICE_ENABLE:
+			oscap_list_add(cmds->service_enable, strdup(word));
+			break;
+		case KS_SERVICE_DISABLE:
+			oscap_list_add(cmds->service_disable, strdup(word));
+			break;
+		case KS_LOGVOL:
+			current_logvol_cmd = malloc(sizeof(struct logvol_cmd));
+			current_logvol_cmd->path = strdup(word);
+			state = KS_LOGVOL_SIZE;
+			break;
+		case KS_LOGVOL_SIZE:
+			current_logvol_cmd->size = strdup(word);
+			oscap_list_add(cmds->logvol, current_logvol_cmd);
+			current_logvol_cmd = NULL;
+			state = KS_ERROR;
+			break;
+		case KS_BOOTLOADER:
+			oscap_list_add(cmds->bootloader, strdup(word));
+			break;
+		case KS_KDUMP:
+			if (!strcmp(word, "disable")) {
+				cmds->enable_kdump = false;
+			} else {
+				ret = 1;
+				oscap_seterr(OSCAP_EFAMILY_OSCAP, "Unsupported 'kdump' command keyword '%s' in command: '%s'", word, line);
+				goto cleanup;
+			}
+			break;
+		case KS_ERROR:
+			ret = 1;
+			oscap_seterr(OSCAP_EFAMILY_OSCAP, "Unexpected string '%s' in command: '%s'", word, line);
+			goto cleanup;
+		default:
+			break;
+		}
+	}
+
+cleanup:
+	free(words);
+	free(dup);
+	return ret;
+}
+
+static int _xccdf_policy_rule_generate_kickstart_fix(struct xccdf_policy *policy, struct xccdf_rule *rule, const char *template, struct kickstart_commands *cmds)
+{
+	char *fix_text = NULL;
+	int ret = _xccdf_policy_rule_get_fix_text(policy, rule, template, &fix_text);
+	if (fix_text == NULL) {
+		return ret;
+	}
+	char *dup = strdup(fix_text);
+	char **lines = oscap_split(dup, "\n");
+	enum states {
+		KS_R_P_NORMAL,
+		KS_R_P_PRE_BLOCK,
+		KS_R_P_POST_BLOCK
+	};
+	int state = KS_R_P_NORMAL;
+	char *block = NULL;
+	for (unsigned int i = 0; lines[i] != NULL; i++) {
+		char *line = lines[i];
+		char *trim_line = oscap_trim(strdup(line));
+		switch (state) {
+		case KS_R_P_NORMAL:
+			if (oscap_str_startswith(trim_line, "%pre")) {
+				state = KS_R_P_PRE_BLOCK;
+				block = strdup(trim_line);
+				block = oscap_concat(block, "\n");
+			} else if (oscap_str_startswith(trim_line, "%post")) {
+				state = KS_R_P_POST_BLOCK;
+				block = strdup(trim_line);
+				block = oscap_concat(block, "\n");
+			} else if (*trim_line != '#' && *trim_line != '\0') {
+				_parse_line(trim_line, cmds);
+			}
+			break;
+		case KS_R_P_PRE_BLOCK:
+			if (oscap_str_startswith(trim_line, "%end")) {
+				state = KS_R_P_NORMAL;
+				block = oscap_concat(block, trim_line);
+				block = oscap_concat(block, "\n");
+				oscap_list_add(cmds->pre, block);
+				block = NULL;
+			} else {
+				block = oscap_concat(block, line);
+				block = oscap_concat(block, "\n");
+			}
+			break;
+		case KS_R_P_POST_BLOCK:
+			if (oscap_str_startswith(trim_line, "%end")) {
+				state = KS_R_P_NORMAL;
+				block = oscap_concat(block, trim_line);
+				block = oscap_concat(block, "\n");
+				oscap_list_add(cmds->post, block);
+				block = NULL;
+			} else {
+				block = oscap_concat(block, line);
+				block = oscap_concat(block, "\n");
+			}
+		default:
+			break;
+		}
+		free(trim_line);
+	}
+	if (state != KS_R_P_NORMAL) {
+		oscap_seterr(OSCAP_EFAMILY_OSCAP, "Unfinished block in kickstart remediation in rule %s\n", xccdf_rule_get_id(rule));
+	}
+	free(lines);
+	free(dup);
+	free(fix_text);
+	return ret;
+}
+
 static int _xccdf_policy_rule_generate_ansible_fix(struct xccdf_policy *policy, struct xccdf_rule *rule, const char *template, struct oscap_list *variables, struct oscap_list *tasks)
 {
 	char *fix_text = NULL;
@@ -1011,10 +1213,10 @@ static char *_comment_multiline_text(char *text)
 	return buffer;
 }
 
-static int _write_script_header_to_fd(struct xccdf_policy *policy, struct xccdf_result *result, const char *sys, int output_fd)
+static int _write_script_header_to_fd(struct xccdf_policy *policy, struct xccdf_result *result, const char *sys, const char *input_file_name, const char *tailoring_file_name, int output_fd)
 {
 	if (!(oscap_streq(sys, "") || oscap_streq(sys, "urn:xccdf:fix:script:sh") || oscap_streq(sys, "urn:xccdf:fix:commands") ||
-		  oscap_streq(sys, "urn:xccdf:fix:script:ansible") || oscap_streq(sys, "urn:redhat:osbuild:blueprint")))
+		  oscap_streq(sys, "urn:xccdf:fix:script:ansible") || oscap_streq(sys, "urn:redhat:osbuild:blueprint") || oscap_streq(sys, "urn:xccdf:fix:script:kickstart") ))
 		return 0; // no header required
 
 	const char *oscap_version = oscap_get_version();
@@ -1044,6 +1246,14 @@ static int _write_script_header_to_fd(struct xccdf_policy *policy, struct xccdf_
 		shebang_with_newline = "#!/usr/bin/env bash\n";
 	}
 
+	if (oscap_streq(sys, "urn:xccdf:fix:script:kickstart")) {
+		how_to_apply = "# Review the kickstart and customize the kickstart for your deployment.\n"
+			"# Pay attention to items marked as \"required for security compliance\".\n"
+			"# Install the operating system using this kickstart.";
+		format = "kickstart";
+		remediation_type = "Kickstart";
+	}
+
 	char *fix_header;
 
 	struct xccdf_profile *profile = xccdf_policy_get_profile(policy);
@@ -1071,7 +1281,10 @@ static int _write_script_header_to_fd(struct xccdf_policy *policy, struct xccdf_
 		free(profile_description);
 
 		const struct xccdf_version_info *xccdf_version = benchmark ? xccdf_benchmark_get_schema_version(benchmark) : NULL;
+		char *profile_id_banner = profile_id ? oscap_sprintf("# Profile ID:  %s\n", profile_id) : strdup("");
 		const char *xccdf_version_name = xccdf_version ? xccdf_version_info_get_version(xccdf_version) : "Unknown";
+		char *tailoring_option = tailoring_file_name ? oscap_sprintf(" --tailoring-file %s", tailoring_file_name) : strdup("");
+		char *profile_option = profile_id ? oscap_sprintf(" --profile %s", profile_id) : strdup("");
 
 		fix_header = oscap_sprintf(
 			"%s"
@@ -1082,13 +1295,13 @@ static int _write_script_header_to_fd(struct xccdf_policy *policy, struct xccdf_
 			"# Profile Description:\n"
 			"# %s\n"
 			"#\n"
-			"# Profile ID:  %s\n"
+			"%s"
 			"# Benchmark ID:  %s\n"
 			"# Benchmark Version:  %s\n"
 			"# XCCDF Version:  %s\n"
 			"#\n"
 			"# This file was generated by OpenSCAP %s using:\n"
-			"# $ oscap xccdf generate fix --profile %s --fix-type %s xccdf-file.xml\n"
+			"# $ oscap xccdf generate fix%s%s --fix-type %s %s\n"
 			"#\n"
 			"# This %s is generated from an OpenSCAP profile without preliminary evaluation.\n"
 			"# It attempts to fix every selected rule, even if the system is already compliant.\n"
@@ -1099,12 +1312,15 @@ static int _write_script_header_to_fd(struct xccdf_policy *policy, struct xccdf_
 			"###############################################################################\n\n",
 			shebang_with_newline, remediation_type, profile_title,
 			commented_profile_description,
-			profile_id, benchmark_id, benchmark_version_info, xccdf_version_name,
-			oscap_version, profile_id, format, remediation_type,
+			profile_id_banner, benchmark_id, benchmark_version_info, xccdf_version_name,
+			oscap_version, tailoring_option, profile_option, format, input_file_name, remediation_type,
 			remediation_type, how_to_apply
 		);
 
+		free(profile_id_banner);
+		free(tailoring_option);
 		free(commented_profile_description);
+		free(profile_option);
 
 	} else {
 		// Results-based remediation fix
@@ -1286,10 +1502,287 @@ static int _xccdf_policy_generate_fix_other(struct oscap_list *rules_to_fix, str
 	return ret;
 }
 
-int xccdf_policy_generate_fix(struct xccdf_policy *policy, struct xccdf_result *result, const char *sys, int output_fd)
+static int _generate_kickstart_services(struct kickstart_commands *cmds, int output_fd)
+{
+	struct oscap_iterator *service_disable_it = oscap_iterator_new(cmds->service_disable);
+	struct oscap_iterator *service_enable_it = oscap_iterator_new(cmds->service_enable);
+	if (oscap_iterator_has_more(service_disable_it) || oscap_iterator_has_more(service_enable_it)) {
+		_write_text_to_fd(output_fd, "# Disable and enable systemd services (required for security compliance)\n");
+		_write_text_to_fd(output_fd, "services");
+		if (oscap_iterator_has_more(service_disable_it)) {
+			_write_text_to_fd(output_fd, " --disabled=");
+			while (oscap_iterator_has_more(service_disable_it)) {
+				char *command = (char *) oscap_iterator_next(service_disable_it);
+				_write_text_to_fd(output_fd, command);
+				if (oscap_iterator_has_more(service_disable_it))
+					_write_text_to_fd(output_fd, ",");
+			}
+		}
+		if (oscap_iterator_has_more(service_enable_it)) {
+			_write_text_to_fd(output_fd, " --enabled=");
+			while (oscap_iterator_has_more(service_enable_it)) {
+				char *command = (char *) oscap_iterator_next(service_enable_it);
+				_write_text_to_fd(output_fd, command);
+				if (oscap_iterator_has_more(service_enable_it))
+					_write_text_to_fd(output_fd, ",");
+			}
+		}
+		_write_text_to_fd(output_fd, "\n\n");
+	}
+	oscap_iterator_free(service_disable_it);
+	oscap_iterator_free(service_enable_it);
+	return 0;
+}
+
+static int _generate_kickstart_packages(struct kickstart_commands *cmds, int output_fd)
+{
+	_write_text_to_fd(output_fd, "# Packages selection (required for security compliance)\n");
+	_write_text_to_fd(output_fd, "%packages\n");
+	/* openscap-scanner and scap-security-guide needs to be installed because we will run oscap in the %post section */
+	_write_text_to_fd(output_fd, "openscap-scanner\n");
+	_write_text_to_fd(output_fd, "scap-security-guide\n");
+	struct oscap_iterator *package_install_it = oscap_iterator_new(cmds->package_install);
+	while (oscap_iterator_has_more(package_install_it)) {
+		char *package = (char *) oscap_iterator_next(package_install_it);
+		_write_text_to_fd(output_fd, package);
+		_write_text_to_fd(output_fd, "\n");
+	}
+	oscap_iterator_free(package_install_it);
+	struct oscap_iterator *package_remove_it = oscap_iterator_new(cmds->package_remove);
+	while (oscap_iterator_has_more(package_remove_it)) {
+		char *package = (char *) oscap_iterator_next(package_remove_it);
+		_write_text_to_fd(output_fd, "-");
+		_write_text_to_fd(output_fd, package);
+		_write_text_to_fd(output_fd, "\n");
+	}
+	oscap_iterator_free(package_remove_it);
+	_write_text_to_fd(output_fd, "%end\n");
+	_write_text_to_fd(output_fd, "\n");
+	return 0;
+}
+
+static void _write_tailoring_to_fd(struct oscap_source *tailoring, int output_fd)
+{
+	if (tailoring == NULL)
+		return;
+	_write_text_to_fd(output_fd, "cat >/root/oscap_tailoring.xml <<END_OF_TAILORING\n");
+	oscap_source_to_fd(tailoring, output_fd);
+	_write_text_to_fd(output_fd, "END_OF_TAILORING\n");
+}
+
+static int _generate_kickstart_oscap_post(struct kickstart_commands *cmds, const char *profile_id, const char *input_path, struct oscap_source *tailoring, int output_fd)
+{
+	_write_text_to_fd(output_fd, "# Perform OpenSCAP hardening (required for security compliance)\n");
+	_write_text_to_fd(output_fd, "%post --erroronfail\n");
+	const char *fmt = "oscap xccdf eval --remediate%s--results-arf /root/oscap_arf.xml --report /root/oscap_report.html%s/usr/share/xml/scap/ssg/content/%s\n";
+	const char *tailoring_part;
+	if (tailoring != NULL) {
+		tailoring_part = " --tailoring-file /root/oscap_tailoring.xml ";
+	} else {
+		tailoring_part = " ";
+	}
+	char *profile_part;
+	if (profile_id != NULL) {
+		profile_part = oscap_sprintf(" --profile '%s' ", profile_id);
+	} else {
+		profile_part = strdup(" ");
+	}
+	char *dup = strdup(input_path);
+	char *basename = oscap_basename(dup);
+	free(dup);
+	char *oscap_command = oscap_sprintf(fmt, tailoring_part, profile_part, basename);
+	free(profile_part);
+	free(basename);
+	_write_tailoring_to_fd(tailoring, output_fd);
+	_write_text_to_fd_and_free(output_fd, oscap_command);
+	_write_text_to_fd(output_fd, "[ $? -eq 0 -o $? -eq 2 ] || exit 1\n");
+	_write_text_to_fd(output_fd, "%end\n");
+	_write_text_to_fd(output_fd, "\n");
+	return 0;
+}
+
+static int _generate_kickstart_pre(struct kickstart_commands *cmds, int output_fd)
+{
+	struct oscap_iterator *pre_it = oscap_iterator_new(cmds->pre);
+	while (oscap_iterator_has_more(pre_it)) {
+		_write_text_to_fd(output_fd, "# Additional %pre section (required for security compliance)\n");
+		char *pre_content = (char *) oscap_iterator_next(pre_it);
+		_write_text_to_fd(output_fd, pre_content);
+		_write_text_to_fd(output_fd, "\n");
+	}
+	oscap_iterator_free(pre_it);
+	return 0;
+}
+
+static int _generate_kickstart_post(struct kickstart_commands *cmds, int output_fd)
+{
+	struct oscap_iterator *post_it = oscap_iterator_new(cmds->post);
+	while (oscap_iterator_has_more(post_it)) {
+		_write_text_to_fd(output_fd, "# Additional %post section (required for security compliance)\n");
+		char *post_content = (char *) oscap_iterator_next(post_it);
+		_write_text_to_fd(output_fd, post_content);
+		_write_text_to_fd(output_fd, "\n");
+	}
+	oscap_iterator_free(post_it);
+	return 0;
+}
+
+const char *common_partition = (
+	"# Create partition layout scheme (required for security compliance)\n"
+	"zerombr\n"
+	"clearpart --all --initlabel\n"
+	"reqpart --add-boot\n"
+	"part pv.01 --grow --size=1\n"
+	"volgroup system pv.01\n"
+	"logvol / --name=root --vgname=system --size=2000 --grow\n"
+	"logvol swap --name=swap --vgname=system --size=1000\n"
+);
+
+/* Fallback partition layout for profiles that don't specify partitioning layout */
+/* We need to specify at least some layout in the kickstart to make the installation fully automated. */
+const char *fallback_partition = (
+	"# Create partition layout scheme (optional)\n"
+	"zerombr\n"
+	"clearpart --all --initlabel\n"
+	"autopart --type=lvm\n"
+);
+
+static int _generate_kickstart_logvol(struct kickstart_commands *cmds, int output_fd)
+{
+	struct oscap_iterator *logvol_it = oscap_iterator_new(cmds->logvol);
+	if (oscap_iterator_has_more(logvol_it)) {
+		_write_text_to_fd(output_fd, common_partition);
+	} else {
+		_write_text_to_fd(output_fd, fallback_partition);
+	}
+	while (oscap_iterator_has_more(logvol_it)) {
+		struct logvol_cmd *command = (struct logvol_cmd *) oscap_iterator_next(logvol_it);
+		char *name = strdup(command->path);
+		oscap_strrm(name, "/");
+		char *fmt = oscap_sprintf("logvol %s --name=%s --vgname=system --size=%s\n", command->path, name, command->size);
+		_write_text_to_fd(output_fd, fmt);
+		free(name);
+		free(fmt);
+	}
+	_write_text_to_fd(output_fd, "\n");
+	oscap_iterator_free(logvol_it);
+	return 0;
+}
+
+static int _generate_kickstart_kdump(struct kickstart_commands *cmds, int output_fd)
+{
+	if (!cmds->enable_kdump) {
+		_write_text_to_fd(output_fd,
+			"# Disable the kdump kernel crash dumping mechanism (required for security compliance)\n"
+			"%addon com_redhat_kdump --disable\n"
+			"%end\n"
+			"\n"
+		);
+	}
+	return 0;
+}
+
+static int _generate_kickstart_bootloader(struct kickstart_commands *cmds, int output_fd)
+{
+	struct oscap_iterator *bl_it = oscap_iterator_new(cmds->bootloader);
+	if (!oscap_iterator_has_more(bl_it)) {
+		oscap_iterator_free(bl_it);
+		return 0;
+	}
+	_write_text_to_fd(output_fd, "# Configure boot loader options (required for security compliance)\n");
+	_write_text_to_fd(output_fd, "bootloader --append=\"");
+	while (oscap_iterator_has_more(bl_it)) {
+		char *optval = (char *) oscap_iterator_next(bl_it);
+		_write_text_to_fd(output_fd, optval);
+		if (oscap_iterator_has_more(bl_it))
+			_write_text_to_fd(output_fd, " ");
+	}
+	_write_text_to_fd(output_fd, "\"\n");
+	_write_text_to_fd(output_fd, "\n");
+	oscap_iterator_free(bl_it);
+	return 0;
+}
+
+static void logvol_cmd_free(void *ptr)
+{
+	struct logvol_cmd *cmd = (struct logvol_cmd *) ptr;
+	free(cmd->path);
+	free(cmd->size);
+	free(cmd);
+}
+
+static int _xccdf_policy_generate_fix_kickstart(struct oscap_list *rules_to_fix, struct xccdf_policy *policy, const char *sys, const char *input_file_name, struct oscap_source *tailoring, int output_fd)
+{
+	int ret = 0;
+	struct kickstart_commands cmds = {
+		.package_install = oscap_list_new(),
+		.package_remove = oscap_list_new(),
+		.service_enable = oscap_list_new(),
+		.service_disable = oscap_list_new(),
+		.pre = oscap_list_new(),
+		.post = oscap_list_new(),
+		.logvol = oscap_list_new(),
+		.bootloader = oscap_list_new(),
+		.enable_kdump = true,
+	};
+
+	struct oscap_iterator *rules_to_fix_it = oscap_iterator_new(rules_to_fix);
+	while (oscap_iterator_has_more(rules_to_fix_it)) {
+		struct xccdf_rule *rule = (struct xccdf_rule *) oscap_iterator_next(rules_to_fix_it);
+		ret = _xccdf_policy_rule_generate_kickstart_fix(policy, rule, sys, &cmds);
+		if (ret != 0)
+			break;
+	}
+	oscap_iterator_free(rules_to_fix_it);
+
+	_write_text_to_fd(output_fd, "\n");
+	const char *common = (
+		"# Default values for automated installation\n"
+		"lang en_US.UTF-8\n"
+		"keyboard --vckeymap us\n"
+		"timezone --utc America/New_York\n"
+		"\n"
+		"# Root password is required for system rescue tasks\n"
+		"rootpw changeme\n"
+		"\n"
+	);
+	_write_text_to_fd(output_fd, common);
+
+	_generate_kickstart_pre(&cmds, output_fd);
+
+	_generate_kickstart_logvol(&cmds, output_fd);
+
+	_generate_kickstart_bootloader(&cmds, output_fd);
+
+	_generate_kickstart_kdump(&cmds, output_fd);
+
+	_generate_kickstart_services(&cmds, output_fd);
+
+	_generate_kickstart_packages(&cmds, output_fd);
+
+	const char *profile_id = xccdf_profile_get_id(xccdf_policy_get_profile(policy));
+	_generate_kickstart_oscap_post(&cmds, profile_id, input_file_name, tailoring, output_fd);
+
+	_generate_kickstart_post(&cmds, output_fd);
+
+	_write_text_to_fd(output_fd, "# Reboot after the installation is complete\nreboot\n");
+
+	oscap_list_free(cmds.package_install, free);
+	oscap_list_free(cmds.package_remove, free);
+	oscap_list_free(cmds.service_enable, free);
+	oscap_list_free(cmds.service_disable, free);
+	oscap_list_free(cmds.pre, free);
+	oscap_list_free(cmds.post, free);
+	oscap_list_free(cmds.logvol, logvol_cmd_free);
+	oscap_list_free(cmds.bootloader, free);
+	return ret;
+}
+
+int xccdf_policy_generate_fix(struct xccdf_policy *policy, struct xccdf_result *result, const char *sys, const char *input_file_name, struct oscap_source *tailoring, int output_fd)
 {
 	__attribute__nonnull__(policy);
 	int ret = 0;
+	const char *tailoring_file_name = tailoring ? oscap_source_get_filepath(tailoring) : NULL;
 
 	struct oscap_list *rules_to_fix = oscap_list_new();
 	if (result == NULL) {
@@ -1303,7 +1796,7 @@ int xccdf_policy_generate_fix(struct xccdf_policy *policy, struct xccdf_result *
 			return 1;
 		}
 
-		if (_write_script_header_to_fd(policy, result, sys, output_fd) != 0) {
+		if (_write_script_header_to_fd(policy, result, sys, input_file_name, tailoring_file_name, output_fd) != 0) {
 			oscap_list_free(rules_to_fix, NULL);
 			return 1;
 		}
@@ -1320,7 +1813,7 @@ int xccdf_policy_generate_fix(struct xccdf_policy *policy, struct xccdf_result *
 	else {
 		dI("Generating result-oriented fixes for policy(result/@id=%s)", xccdf_result_get_id(result));
 
-		if (_write_script_header_to_fd(policy, result, sys, output_fd) != 0) {
+		if (_write_script_header_to_fd(policy, result, sys, input_file_name, tailoring_file_name, output_fd) != 0) {
 			oscap_list_free(rules_to_fix, NULL);
 			return 1;
 		}
@@ -1342,6 +1835,8 @@ int xccdf_policy_generate_fix(struct xccdf_policy *policy, struct xccdf_result *
 		ret = _xccdf_policy_generate_fix_ansible(rules_to_fix, policy, sys, output_fd);
 	} else if (strcmp(sys, "urn:redhat:osbuild:blueprint") == 0) {
 		ret = _xccdf_policy_generate_fix_blueprint(rules_to_fix, policy, sys, output_fd);
+	} else if (strcmp(sys, "urn:xccdf:fix:script:kickstart") == 0) {
+		ret = _xccdf_policy_generate_fix_kickstart(rules_to_fix, policy, sys, input_file_name, tailoring, output_fd);
 	} else {
 		ret =  _xccdf_policy_generate_fix_other(rules_to_fix, policy, sys, output_fd);
 	}
diff --git a/src/common/elements.c b/src/common/elements.c
index de4be88f12..6870509dfe 100644
--- a/src/common/elements.c
+++ b/src/common/elements.c
@@ -250,6 +250,28 @@ int oscap_xml_save_filename(const char *filename, xmlDocPtr doc)
 	return (xmlCode >= 1) ? 1 : -1;
 }
 
+int oscap_xml_save_fd(int fd, xmlDocPtr doc)
+{
+	xmlOutputBufferPtr buff;
+	int xmlCode;
+
+	buff = xmlOutputBufferCreateFd(fd, NULL);
+	if (buff == NULL) {
+		close(fd);
+		oscap_setxmlerr(xmlGetLastError());
+		dW("xmlOutputBufferCreateFile() failed.");
+		return -1;
+	}
+
+	xmlCode = xmlSaveFormatFileTo(buff, doc, "UTF-8", 1);
+	if (xmlCode <= 0) {
+		oscap_setxmlerr(xmlGetLastError());
+		dW("No bytes exported: xmlCode: %d.", xmlCode);
+	}
+
+	return (xmlCode >= 1) ? 1 : -1;
+}
+
 int oscap_xml_save_filename_free(const char *filename, xmlDocPtr doc)
 {
 	int ret = oscap_xml_save_filename(filename, doc);
diff --git a/src/common/elements.h b/src/common/elements.h
index aea6f9b830..a8f1cee5bf 100644
--- a/src/common/elements.h
+++ b/src/common/elements.h
@@ -64,10 +64,19 @@ xmlNode *oscap_xmlstr_to_dom(xmlNode *parent, const char *elname, const char *co
  * Save XML Document to the file of the given filename.
  * @param filename path to the file
  * @param doc the XML document content
- * @return 1 on success, -1 on failure (oscap_seterr is set appropriatly).
+ * @return 1 on success, -1 on failure (oscap_seterr is set appropriately).
  */
 int oscap_xml_save_filename(const char *filename, xmlDocPtr doc);
 
+/**
+ * Save XML Document to the given file descriptor.
+ * The file descriptor isn't closed by this function.
+ * @param fd file descriptor
+ * @param doc the XML document content
+ * @return 1 on success, -1 on failure (oscap_seterr is set appropriately).
+ */
+int oscap_xml_save_fd(int fd, xmlDocPtr doc);
+
 /**
  * Save XML Document to the file of the given filename and dispose the document afterwards.
  * @param filename path to the file
diff --git a/src/common/util.c b/src/common/util.c
index fb376a834a..af4e704077 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -474,3 +474,14 @@ bool oscap_path_startswith(const char *path, const char *prefix)
 	free(prefix_split);
 	return res;
 }
+
+char *oscap_concat(char *str1, char *str2)
+{
+	if (str1 == NULL || str2 == NULL)
+		return str1;
+	size_t str1_len = strlen(str1);
+	size_t str2_len = strlen(str2);
+	str1 = realloc(str1, str1_len + str2_len + 1);
+	strncat(str1, str2, str2_len);
+	return str1;
+}
diff --git a/src/common/util.h b/src/common/util.h
index 59a500d1f4..f7e2044134 100644
--- a/src/common/util.h
+++ b/src/common/util.h
@@ -550,4 +550,13 @@ int oscap_open_writable(const char *filename);
  */
 bool oscap_path_startswith(const char *path, const char *prefix);
 
+/**
+ * Concatenate 2 strings
+ * Convenience wrapper over strncat.
+ * @param str1 string 1
+ * @param str2 string 2
+ * @return string 1 with string 2 appended inside
+ */
+char *oscap_concat(char *str1, char *str2);
+
 #endif              /* OSCAP_UTIL_H_ */
diff --git a/src/source/oscap_source.c b/src/source/oscap_source.c
index 59ca9dbafd..2acbe88b27 100644
--- a/src/source/oscap_source.c
+++ b/src/source/oscap_source.c
@@ -443,6 +443,17 @@ int oscap_source_save_as(struct oscap_source *source, const char *filename)
 	return oscap_xml_save_filename(target, doc) == 1 ? 0 : -1;
 }
 
+int oscap_source_to_fd(struct oscap_source *source, int fd)
+{
+	xmlDoc *doc = oscap_source_get_xmlDoc(source);
+	if (doc == NULL) {
+		oscap_seterr(OSCAP_EFAMILY_OSCAP, "Could not save document: DOM representation not available.");
+		return -1;
+	}
+	return oscap_xml_save_fd(fd, doc) == 1 ? 0 : -1;
+
+}
+
 int oscap_source_get_raw_memory(struct oscap_source *source, char **buffer, size_t *size)
 {
 	if (source->origin.memory != NULL) {
diff --git a/src/source/public/oscap_source.h b/src/source/public/oscap_source.h
index a1469fc4ec..06a8dda9af 100644
--- a/src/source/public/oscap_source.h
+++ b/src/source/public/oscap_source.h
@@ -165,6 +165,15 @@ OSCAP_API const char *oscap_source_readable_origin(const struct oscap_source *so
  */
 OSCAP_API int oscap_source_save_as(struct oscap_source *source, const char *filename);
 
+/**
+ * Store the resource represented by oscap_source to the file descriptor.
+ * @memberof oscap_source
+ * @param source The oscap_source to save
+ * @param fd file descriptor
+ * @returns 0 on success, 1 or -1 to indicate error
+ */
+OSCAP_API int oscap_source_to_fd(struct oscap_source *source, int fd);
+
 /**
  * Retrieve contents refered to by oscap_source as raw memory.
  * The memory is always copied. If the origin of oscap_source is raw memory,
diff --git a/tests/API/XCCDF/unittests/CMakeLists.txt b/tests/API/XCCDF/unittests/CMakeLists.txt
index 752da14b9e..c1d636abca 100644
--- a/tests/API/XCCDF/unittests/CMakeLists.txt
+++ b/tests/API/XCCDF/unittests/CMakeLists.txt
@@ -77,6 +77,7 @@ add_oscap_test("test_single_rule.sh")
 add_oscap_test("test_single_rule_stigw.sh")
 add_oscap_test("test_remediation_simple.sh")
 add_oscap_test("test_remediation_offline.sh")
+add_oscap_test("test_remediation_kickstart.sh")
 add_oscap_test("test_remediation_metadata.sh")
 add_oscap_test("test_remediation_blueprint.sh")
 add_oscap_test("test_remediation_bad_fix.sh")
diff --git a/tests/API/XCCDF/unittests/test_remediation_blueprint.sh b/tests/API/XCCDF/unittests/test_remediation_blueprint.sh
index 7c79822529..8ea9fcab83 100755
--- a/tests/API/XCCDF/unittests/test_remediation_blueprint.sh
+++ b/tests/API/XCCDF/unittests/test_remediation_blueprint.sh
@@ -13,15 +13,19 @@ ret=0
 input_xml="$srcdir/${name}.xccdf.xml"
 valid_toml="$srcdir/${name}.toml"
 
+expected_result=$(mktemp)
+sed "s;TEST_XCCDF_FILE_NAME;$input_xml;" "$valid_toml" > "$expected_result"
+
 echo "Stderr file = $stderr"
 echo "Result file = $result"
 [ -f $stderr ]; [ ! -s $stderr ]; :> $stderr
 
-# The $valid_toml file was generated without ' # This file was generated by OpenSCAP 1.3.5 using:' line
+# The expected file was generated without ' # This file was generated by OpenSCAP 1.3.5 using:' line
 # to make the test independent from the scanner version. We have to filter this line from the output as well.
 
 $OSCAP xccdf generate fix --fix-type blueprint --profile 'common' "$input_xml" | grep -v "OpenSCAP" > "$result"
 
-diff $valid_toml $result
+diff "$expected_result" "$result"
 
 rm "$result"
+rm "$expected_result"
diff --git a/tests/API/XCCDF/unittests/test_remediation_blueprint.toml b/tests/API/XCCDF/unittests/test_remediation_blueprint.toml
index 2dfd8fce50..e4ce106b72 100644
--- a/tests/API/XCCDF/unittests/test_remediation_blueprint.toml
+++ b/tests/API/XCCDF/unittests/test_remediation_blueprint.toml
@@ -10,7 +10,7 @@
 # Benchmark Version:  1.0
 # XCCDF Version:  1.2
 #
-# $ oscap xccdf generate fix --profile xccdf_moc.elpmaxe.www_profile_common --fix-type blueprint xccdf-file.xml
+# $ oscap xccdf generate fix --profile xccdf_moc.elpmaxe.www_profile_common --fix-type blueprint TEST_XCCDF_FILE_NAME
 #
 # It attempts to fix every selected rule, even if the system is already compliant.
 #
diff --git a/tests/API/XCCDF/unittests/test_remediation_kickstart.ds.xml b/tests/API/XCCDF/unittests/test_remediation_kickstart.ds.xml
new file mode 100644
index 0000000000..612ac6944c
--- /dev/null
+++ b/tests/API/XCCDF/unittests/test_remediation_kickstart.ds.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ds:data-stream-collection xmlns:ds="http://scap.nist.gov/schema/scap/source/1.2" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:cat="urn:oasis:names:tc:entity:xmlns:xml:catalog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="scap_org.openscap.www_collection_from_xccdf_test_single_rule.xccdf.xml" schematron-version="1.3" xsi:schemaLocation="http://scap.nist.gov/schema/scap/source/1.2 https://scap.nist.gov/schema/scap/1.3/scap-source-data-stream_1.3.xsd">
+  <ds:data-stream id="scap_org.openscap.www_datastream_simple" scap-version="1.3" use-case="OTHER">
+    <ds:checklists>
+      <ds:component-ref id="scap_org.openscap.www_cref_test_single_rule.xccdf.xml" xlink:href="#scap_org.openscap.www_comp_test_single_rule.xccdf.xml">
+        <cat:catalog>
+          <cat:uri name="test_single_rule.oval.xml" uri="#scap_org.openscap.www_cref_test_single_rule.oval.xml"/>
+        </cat:catalog>
+      </ds:component-ref>
+    </ds:checklists>
+    <ds:checks>
+      <ds:component-ref id="scap_org.openscap.www_cref_test_single_rule.oval.xml" xlink:href="#scap_org.openscap.www_comp_test_single_rule.oval.xml"/>
+    </ds:checks>
+  </ds:data-stream>
+  <ds:component id="scap_org.openscap.www_comp_test_single_rule.oval.xml" timestamp="2021-02-01T08:07:06+01:00">
+    <oval_definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" xmlns:ind-def="http://oval.mitre.org/XMLSchema/oval-definitions-5#independent" xmlns:oval-def="http://oval.mitre.org/XMLSchema/oval-definitions-5" xmlns:oval="http://oval.mitre.org/XMLSchema/oval-common-5" xmlns:win-def="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" xsi:schemaLocation="http://oval.mitre.org/XMLSchema/oval-definitions-5 oval-definitions-schema.xsd    http://oval.mitre.org/XMLSchema/oval-definitions-5#independent independent-definitions-schema.xsd http://oval.mitre.org/XMLSchema/oval-definitions-5#windows windows-definitions-schema.xsd">
+      <generator>
+        <oval:schema_version>5.11.2</oval:schema_version>
+        <oval:timestamp>2021-02-01T08:07:06+01:00</oval:timestamp>
+      </generator>
+      <definitions>
+        <definition class="compliance" id="oval:org.openscap.www:def:1" version="1">
+          <metadata>
+            <title>PASS</title>
+            <description>pass</description>
+          </metadata>
+          <criteria>
+            <criterion comment="PASS test" test_ref="oval:org.openscap.www:tst:1"/>
+          </criteria>
+        </definition>
+      </definitions>
+      <tests>
+        <variable_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#independent" id="oval:org.openscap.www:tst:1" check="all" comment="always pass" version="1">
+          <object object_ref="oval:org.openscap.www:obj:1"/>
+        </variable_test>
+      </tests>
+      <objects>
+        <variable_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#independent" id="oval:org.openscap.www:obj:1" version="1" comment="x">
+          <var_ref>oval:org.openscap.www:var:1</var_ref>
+        </variable_object>
+      </objects>
+      <variables>
+        <constant_variable id="oval:org.openscap.www:var:1" version="1" comment="x" datatype="int">
+          <value>100</value>
+        </constant_variable>
+      </variables>
+    </oval_definitions>
+  </ds:component>
+  <ds:component id="scap_org.openscap.www_comp_test_single_rule.xccdf.xml" timestamp="2021-02-01T08:07:06+01:00">
+    <Benchmark xmlns="http://checklists.nist.gov/xccdf/1.2" id="xccdf_org.openscap.www_benchmark_test">
+      <status>accepted</status>
+      <version>1.0</version>
+      <Profile id="xccdf_org.openscap.www_profile_common">
+        <title>Common hardening profile</title>
+        <description>This is a very cool profile</description>
+        <select idref="xccdf_org.openscap.www_rule_1" selected="true"/>
+        <select idref="xccdf_org.openscap.www_rule_2" selected="true"/>
+        <select idref="xccdf_org.openscap.www_rule_3" selected="true"/>
+        <select idref="xccdf_org.openscap.www_rule_4" selected="true"/>
+        <select idref="xccdf_org.openscap.www_rule_5" selected="true"/>
+        <select idref="xccdf_org.openscap.www_rule_6" selected="true"/>
+        <select idref="xccdf_org.openscap.www_rule_7" selected="true"/>
+        <select idref="xccdf_org.openscap.www_rule_8" selected="true"/>
+        <select idref="xccdf_org.openscap.www_rule_9" selected="true"/>
+      </Profile>
+      <Rule selected="false" id="xccdf_org.openscap.www_rule_1">
+        <title>Rule 1: Enable Audit Service</title>
+        <fix system="urn:xccdf:fix:script:kickstart">
+            service enable auditd
+        </fix>
+      </Rule>
+      <Rule selected="false" id="xccdf_org.openscap.www_rule_2">
+        <title>Rule 2: Install rsyslog package</title>
+        <fix system="urn:xccdf:fix:script:kickstart">
+          package install rsyslog
+        </fix>
+      </Rule>
+      <Rule selected="false" id="xccdf_org.openscap.www_rule_3">
+        <title>Rule 3: Enable Rsyslog Service</title>
+        <fix system="urn:xccdf:fix:script:kickstart">
+            # this command should end up in the command section
+            service enable rsyslog
+        </fix>
+      </Rule>
+      <Rule selected="false" id="xccdf_org.openscap.www_rule_4">
+        <title>Rule 4: Remove USBGuard</title>
+        <fix system="urn:xccdf:fix:script:kickstart">
+          package remove usbguard
+        </fix>
+      </Rule>
+      <Rule selected="false" id="xccdf_org.openscap.www_rule_5">
+        <title>Rule 5: Install and enable SSHD</title>
+        <fix system="urn:xccdf:fix:script:kickstart">
+          # openssh-server will go to %packages section
+          package install openssh-server
+
+          # the service commands will end up in the command section
+          service enable sshd
+          service disable telnet
+        </fix>
+      </Rule>
+      <Rule selected="false" id="xccdf_org.openscap.www_rule_6">
+        <title>Rule 6: Configure all partitions</title>
+        <fix system="urn:xccdf:fix:script:kickstart">
+          logvol /var/tmp 1024
+        </fix>
+      </Rule>
+      <Rule selected="false" id="xccdf_org.openscap.www_rule_7">
+        <title>Rule 7: Bootloader</title>
+        <fix system="urn:xccdf:fix:script:kickstart">
+          bootloader quick
+          bootloader audit=1
+        </fix>
+      </Rule>
+      <Rule selected="false" id="xccdf_org.openscap.www_rule_8">
+        <title>Rule 8: Extra nochroot %post section</title>
+        <fix system="urn:xccdf:fix:script:kickstart">
+          %post --nochroot
+          mkdir -p /etc/ddfds
+          %end
+        </fix>
+      </Rule>
+      <Rule selected="false" id="xccdf_org.openscap.www_rule_9">
+        <title>Rule 9: Crazy remediation</title>
+        <fix system="urn:xccdf:fix:script:kickstart">
+          %post --nochroot
+          mkdir -p /etc/abcd
+          %end
+          service disable httpd
+          # other post section
+          %post
+          rm -rf /etc/xyz
+          # create a new path
+          feel /etc/xyz
+          %end
+          package install podman
+          kdump disable
+        </fix>
+      </Rule>
+    </Benchmark>
+  </ds:component>
+</ds:data-stream-collection>
diff --git a/tests/API/XCCDF/unittests/test_remediation_kickstart.sh b/tests/API/XCCDF/unittests/test_remediation_kickstart.sh
new file mode 100755
index 0000000000..97fbf7124a
--- /dev/null
+++ b/tests/API/XCCDF/unittests/test_remediation_kickstart.sh
@@ -0,0 +1,111 @@
+#!/usr/bin/env bash
+. $builddir/tests/test_common.sh
+
+set -e -o pipefail
+
+function test_normal {
+    kickstart=$(mktemp)
+    stderr=$(mktemp)
+    expected_modified=$(mktemp)
+    kickstart_modified=$(mktemp)
+
+    sed "/This file was generated by OpenSCAP .* using:/d" "$srcdir/test_remediation_kickstart_expected.cfg" > "$expected_modified"
+    sed -i "s;TEST_DATA_STREAM_PATH;$srcdir/test_remediation_kickstart.ds.xml;" "$expected_modified"
+
+    $OSCAP xccdf generate fix --fix-type kickstart --output "$kickstart" --profile common "$srcdir/test_remediation_kickstart.ds.xml"
+
+    sed "/This file was generated by OpenSCAP .* using:/d" "$kickstart" > "$kickstart_modified"
+
+    diff -u "$expected_modified" "$kickstart_modified"
+
+    rm -rf "$kickstart"
+    rm -rf "$stderr"
+    rm -rf "$expected_modified"
+    rm -rf "$kickstart_modified"
+}
+
+function test_tailoring {
+    kickstart=$(mktemp)
+    stderr=$(mktemp)
+
+    $OSCAP xccdf generate fix --tailoring-file "$srcdir/test_remediation_kickstart.tailoring.xml" --fix-type kickstart --output "$kickstart" --profile custom "$srcdir/test_remediation_kickstart.ds.xml"
+
+    grep -q 'services --enabled=auditd,rsyslog' "$kickstart"
+    ! grep -q 'openssh-server' "$kickstart"
+    grep -q 'cat >/root/oscap_tailoring.xml <<END_OF_TAILORING' "$kickstart"
+    grep -q 'ns0:Tailoring' "$kickstart"
+    grep -q 'oscap xccdf eval --remediate --tailoring-file /root/oscap_tailoring.xml' "$kickstart"
+
+    rm -rf "$kickstart"
+    rm -rf "$stderr"
+}
+
+
+function test_results_oriented {
+    kickstart=$(mktemp)
+    stderr=$(mktemp)
+
+    $OSCAP xccdf generate fix --fix-type kickstart --output "$kickstart" --result-id xccdf_org.open-scap_testresult_xccdf_org.ssgproject.content_profile_ospp "$srcdir/test_remediation_kickstart.ds.xml" 2> "$stderr" || ret=$?
+
+    [ $ret = 1 ]
+    grep -q "It isn't possible to generate results-oriented Kickstarts." $stderr
+
+    rm -rf "$kickstart"
+    rm -rf "$stderr"
+}
+
+function test_error_service {
+    kickstart=$(mktemp)
+    stderr=$(mktemp)
+
+    $OSCAP xccdf generate fix --fix-type kickstart --output "$kickstart" --profile broken_service "$srcdir/test_remediation_kickstart_invalid.ds.xml" 2> "$stderr"
+
+    grep -q "Unsupported 'service' command keyword 'slow' in command: 'service slow down'" "$stderr"
+
+    rm -rf "$kickstart"
+    rm -rf "$stderr"
+}
+
+function test_error_package {
+    kickstart=$(mktemp)
+    stderr=$(mktemp)
+
+    $OSCAP xccdf generate fix --fix-type kickstart --output "$kickstart" --profile broken_package "$srcdir/test_remediation_kickstart_invalid.ds.xml" 2> "$stderr"
+
+    grep -q "Unsupported 'package' command keyword 'build' in command:'package build sources'" "$stderr"
+
+    rm -rf "$kickstart"
+    rm -rf "$stderr"
+}
+
+function test_error_logvol {
+    kickstart=$(mktemp)
+    stderr=$(mktemp)
+
+    $OSCAP xccdf generate fix --fix-type kickstart --output "$kickstart" --profile broken_logvol "$srcdir/test_remediation_kickstart_invalid.ds.xml" 2> "$stderr"
+
+    grep -q "Unexpected string 'crypto' in command: 'logvol /var 158 crypto'" "$stderr"
+
+    rm -rf "$kickstart"
+    rm -rf "$stderr"
+}
+
+function test_error_unknown {
+    kickstart=$(mktemp)
+    stderr=$(mktemp)
+
+    $OSCAP xccdf generate fix --fix-type kickstart --output "$kickstart" --profile unknown_command "$srcdir/test_remediation_kickstart_invalid.ds.xml" 2> "$stderr"
+
+    grep -q "Unsupported command keyword 'unknown' in command: 'unknown command'" "$stderr"
+
+    rm -rf "$kickstart"
+    rm -rf "$stderr"
+}
+
+test_normal
+test_tailoring
+test_results_oriented
+test_error_service
+test_error_package
+test_error_logvol
+test_error_unknown
diff --git a/tests/API/XCCDF/unittests/test_remediation_kickstart.tailoring.xml b/tests/API/XCCDF/unittests/test_remediation_kickstart.tailoring.xml
new file mode 100644
index 0000000000..5f04670209
--- /dev/null
+++ b/tests/API/XCCDF/unittests/test_remediation_kickstart.tailoring.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" ?>
+<ns0:Tailoring xmlns:ns0="http://checklists.nist.gov/xccdf/1.2" id="xccdf_auto_tailoring_default">
+	<ns0:benchmark href="tests/API/XCCDF/unittests/test_remediation_kickstart.ds.xml"/>
+	<ns0:version time="2024-07-23T17:02:55.239590">1</ns0:version>
+	<ns0:Profile id="xccdf_org.openscap.www_profile_custom" extends="xccdf_org.openscap.www_profile_common">
+		<ns0:title override="false"/>
+		<ns0:select idref="xccdf_org.openscap.www_rule_2" selected="false"/>
+		<ns0:select idref="xccdf_org.openscap.www_rule_4" selected="false"/>
+		<ns0:select idref="xccdf_org.openscap.www_rule_5" selected="false"/>
+		<ns0:select idref="xccdf_org.openscap.www_rule_6" selected="false"/>
+		<ns0:select idref="xccdf_org.openscap.www_rule_7" selected="false"/>
+		<ns0:select idref="xccdf_org.openscap.www_rule_8" selected="false"/>
+		<ns0:select idref="xccdf_org.openscap.www_rule_9" selected="false"/>
+	</ns0:Profile>
+</ns0:Tailoring>
diff --git a/tests/API/XCCDF/unittests/test_remediation_kickstart_expected.cfg b/tests/API/XCCDF/unittests/test_remediation_kickstart_expected.cfg
new file mode 100644
index 0000000000..7502fdab72
--- /dev/null
+++ b/tests/API/XCCDF/unittests/test_remediation_kickstart_expected.cfg
@@ -0,0 +1,89 @@
+###############################################################################
+#
+# Kickstart for Common hardening profile
+#
+# Profile Description:
+# This is a very cool profile
+#
+# Profile ID:  xccdf_org.openscap.www_profile_common
+# Benchmark ID:  xccdf_org.openscap.www_benchmark_test
+# Benchmark Version:  1.0
+# XCCDF Version:  1.2
+#
+# This file was generated by OpenSCAP 1.4.0 using:
+# $ oscap xccdf generate fix --profile xccdf_org.openscap.www_profile_common --fix-type kickstart TEST_DATA_STREAM_PATH
+#
+# This Kickstart is generated from an OpenSCAP profile without preliminary evaluation.
+# It attempts to fix every selected rule, even if the system is already compliant.
+#
+# How to apply this Kickstart:
+# Review the kickstart and customize the kickstart for your deployment.
+# Pay attention to items marked as "required for security compliance".
+# Install the operating system using this kickstart.
+#
+###############################################################################
+
+
+# Default values for automated installation
+lang en_US.UTF-8
+keyboard --vckeymap us
+timezone --utc America/New_York
+
+# Root password is required for system rescue tasks
+rootpw changeme
+
+# Create partition layout scheme (required for security compliance)
+zerombr
+clearpart --all --initlabel
+reqpart --add-boot
+part pv.01 --grow --size=1
+volgroup system pv.01
+logvol / --name=root --vgname=system --size=2000 --grow
+logvol swap --name=swap --vgname=system --size=1000
+logvol /var/tmp --name=vartmp --vgname=system --size=1024
+
+# Configure boot loader options (required for security compliance)
+bootloader --append="quick audit=1"
+
+# Disable the kdump kernel crash dumping mechanism (required for security compliance)
+%addon com_redhat_kdump --disable
+%end
+
+# Disable and enable systemd services (required for security compliance)
+services --disabled=telnet,httpd --enabled=auditd,rsyslog,sshd
+
+# Packages selection (required for security compliance)
+%packages
+openscap-scanner
+scap-security-guide
+rsyslog
+openssh-server
+podman
+-usbguard
+%end
+
+# Perform OpenSCAP hardening (required for security compliance)
+%post --erroronfail
+oscap xccdf eval --remediate --results-arf /root/oscap_arf.xml --report /root/oscap_report.html --profile 'xccdf_org.openscap.www_profile_common' /usr/share/xml/scap/ssg/content/test_remediation_kickstart.ds.xml
+[ $? -eq 0 -o $? -eq 2 ] || exit 1
+%end
+
+# Additional %post section (required for security compliance)
+%post --nochroot
+          mkdir -p /etc/ddfds
+%end
+
+# Additional %post section (required for security compliance)
+%post --nochroot
+          mkdir -p /etc/abcd
+%end
+
+# Additional %post section (required for security compliance)
+%post
+          rm -rf /etc/xyz
+          # create a new path
+          feel /etc/xyz
+%end
+
+# Reboot after the installation is complete
+reboot
diff --git a/tests/API/XCCDF/unittests/test_remediation_kickstart_invalid.ds.xml b/tests/API/XCCDF/unittests/test_remediation_kickstart_invalid.ds.xml
new file mode 100644
index 0000000000..daeb52d425
--- /dev/null
+++ b/tests/API/XCCDF/unittests/test_remediation_kickstart_invalid.ds.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ds:data-stream-collection xmlns:ds="http://scap.nist.gov/schema/scap/source/1.2" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:cat="urn:oasis:names:tc:entity:xmlns:xml:catalog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="scap_org.openscap.www_collection_from_xccdf_test_single_rule.xccdf.xml" schematron-version="1.3" xsi:schemaLocation="http://scap.nist.gov/schema/scap/source/1.2 https://scap.nist.gov/schema/scap/1.3/scap-source-data-stream_1.3.xsd">
+  <ds:data-stream id="scap_org.openscap.www_datastream_simple" scap-version="1.3" use-case="OTHER">
+    <ds:checklists>
+      <ds:component-ref id="scap_org.openscap.www_cref_test_single_rule.xccdf.xml" xlink:href="#scap_org.openscap.www_comp_test_single_rule.xccdf.xml">
+        <cat:catalog>
+          <cat:uri name="test_single_rule.oval.xml" uri="#scap_org.openscap.www_cref_test_single_rule.oval.xml"/>
+        </cat:catalog>
+      </ds:component-ref>
+    </ds:checklists>
+    <ds:checks>
+      <ds:component-ref id="scap_org.openscap.www_cref_test_single_rule.oval.xml" xlink:href="#scap_org.openscap.www_comp_test_single_rule.oval.xml"/>
+    </ds:checks>
+  </ds:data-stream>
+  <ds:component id="scap_org.openscap.www_comp_test_single_rule.oval.xml" timestamp="2021-02-01T08:07:06+01:00">
+    <oval_definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5" xmlns:ind-def="http://oval.mitre.org/XMLSchema/oval-definitions-5#independent" xmlns:oval-def="http://oval.mitre.org/XMLSchema/oval-definitions-5" xmlns:oval="http://oval.mitre.org/XMLSchema/oval-common-5" xmlns:win-def="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" xsi:schemaLocation="http://oval.mitre.org/XMLSchema/oval-definitions-5 oval-definitions-schema.xsd    http://oval.mitre.org/XMLSchema/oval-definitions-5#independent independent-definitions-schema.xsd http://oval.mitre.org/XMLSchema/oval-definitions-5#windows windows-definitions-schema.xsd">
+      <generator>
+        <oval:schema_version>5.11.2</oval:schema_version>
+        <oval:timestamp>2021-02-01T08:07:06+01:00</oval:timestamp>
+      </generator>
+      <definitions>
+        <definition class="compliance" id="oval:org.openscap.www:def:1" version="1">
+          <metadata>
+            <title>PASS</title>
+            <description>pass</description>
+          </metadata>
+          <criteria>
+            <criterion comment="PASS test" test_ref="oval:org.openscap.www:tst:1"/>
+          </criteria>
+        </definition>
+      </definitions>
+      <tests>
+        <variable_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#independent" id="oval:org.openscap.www:tst:1" check="all" comment="always pass" version="1">
+          <object object_ref="oval:org.openscap.www:obj:1"/>
+        </variable_test>
+      </tests>
+      <objects>
+        <variable_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#independent" id="oval:org.openscap.www:obj:1" version="1" comment="x">
+          <var_ref>oval:org.openscap.www:var:1</var_ref>
+        </variable_object>
+      </objects>
+      <variables>
+        <constant_variable id="oval:org.openscap.www:var:1" version="1" comment="x" datatype="int">
+          <value>100</value>
+        </constant_variable>
+      </variables>
+    </oval_definitions>
+  </ds:component>
+  <ds:component id="scap_org.openscap.www_comp_test_single_rule.xccdf.xml" timestamp="2021-02-01T08:07:06+01:00">
+    <Benchmark xmlns="http://checklists.nist.gov/xccdf/1.2" id="xccdf_org.openscap.www_benchmark_test">
+      <status>accepted</status>
+      <version>1.0</version>
+      <Profile id="xccdf_org.openscap.www_profile_broken_service">
+        <title>Common hardening profile</title>
+        <description>This is a very cool profile</description>
+        <select idref="xccdf_org.openscap.www_rule_1" selected="true"/>
+      </Profile>
+      <Profile id="xccdf_org.openscap.www_profile_broken_package">
+        <title>Common hardening profile</title>
+        <description>This is a very cool profile</description>
+        <select idref="xccdf_org.openscap.www_rule_2" selected="true"/>
+      </Profile>
+      <Profile id="xccdf_org.openscap.www_profile_broken_logvol">
+        <title>Common hardening profile</title>
+        <description>This is a very cool profile</description>
+        <select idref="xccdf_org.openscap.www_rule_3" selected="true"/>
+      </Profile>
+      <Profile id="xccdf_org.openscap.www_profile_unknown_command">
+        <title>Common hardening profile</title>
+        <description>This is a very cool profile</description>
+        <select idref="xccdf_org.openscap.www_rule_4" selected="true"/>
+      </Profile>
+      <Rule selected="false" id="xccdf_org.openscap.www_rule_1">
+        <title>Rule 1: Unsupported service command</title>
+        <fix system="urn:xccdf:fix:script:kickstart">
+            service slow down
+        </fix>
+      </Rule>
+      <Rule selected="false" id="xccdf_org.openscap.www_rule_2">
+        <title>Rule 2: Unsupported package command</title>
+        <fix system="urn:xccdf:fix:script:kickstart">
+          package build sources
+        </fix>
+      </Rule>
+      <Rule selected="false" id="xccdf_org.openscap.www_rule_3">
+        <title>Rule 3: Logvol command with offending trail</title>
+        <fix system="urn:xccdf:fix:script:kickstart">
+            logvol /var 158 crypto
+        </fix>
+      </Rule>
+      <Rule selected="false" id="xccdf_org.openscap.www_rule_4">
+        <title>Rule 4: Unknown command</title>
+        <fix system="urn:xccdf:fix:script:kickstart">
+          unknown command
+        </fix>
+      </Rule>
+    </Benchmark>
+  </ds:component>
+</ds:data-stream-collection>
diff --git a/utils/oscap-xccdf.c b/utils/oscap-xccdf.c
index 852b3ef401..d4d191ea25 100644
--- a/utils/oscap-xccdf.c
+++ b/utils/oscap-xccdf.c
@@ -281,7 +281,7 @@ static struct oscap_module XCCDF_GEN_FIX = {
     .help = GEN_OPTS
         "\nFix Options:\n"
 		"   --fix-type <type>             - Fix type. Should be one of: bash, ansible, puppet, anaconda, ignition, kubernetes,\n"
-		"                                   blueprint (default: bash).\n"
+		"                                   blueprint, kickstart (default: bash).\n"
 		"   --output <file>               - Write the script into file.\n"
 		"   --result-id <id>              - Fixes will be generated for failed rule-results of the specified TestResult.\n"
 		"   --benchmark-id <id>           - ID of XCCDF Benchmark in some component in the data stream that should be used.\n"
@@ -948,6 +948,8 @@ int app_generate_fix(const struct oscap_action *action)
 			remediation_system = "urn:xccdf:fix:script:sh";
 		} else if (strcmp(action->fix_type, "ansible") == 0) {
 			remediation_system = "urn:xccdf:fix:script:ansible";
+		} else if (strcmp(action->fix_type, "kickstart") == 0) {
+			remediation_system = "urn:xccdf:fix:script:kickstart";
 		} else if (strcmp(action->fix_type, "puppet") == 0) {
 			remediation_system = "urn:xccdf:fix:script:puppet";
 		} else if (strcmp(action->fix_type, "anaconda") == 0) {
@@ -961,7 +963,7 @@ int app_generate_fix(const struct oscap_action *action)
 		} else {
 			fprintf(stderr,
 					"Unknown fix type '%s'.\n"
-					"Please provide one of: bash, ansible, puppet, anaconda, ignition, kubernetes, blueprint.\n",
+					"Please provide one of: bash, ansible, kickstart, puppet, anaconda, ignition, kubernetes, blueprint.\n",
 					action->fix_type);
 			return OSCAP_ERROR;
 		}
@@ -969,6 +971,11 @@ int app_generate_fix(const struct oscap_action *action)
 		remediation_system = "urn:xccdf:fix:script:sh";
 	}
 
+	if (action->id != NULL && action->fix_type != NULL && !strcmp(action->fix_type, "kickstart")) {
+		fprintf(stderr, "It isn't possible to generate results-oriented Kickstarts.\n");
+		return OSCAP_ERROR;
+	}
+
 	int ret = OSCAP_ERROR;
 	struct oscap_source *source = oscap_source_new_from_file(action->f_xccdf);
 	oscap_document_type_t document_type = oscap_source_get_scap_type(source);
@@ -1026,6 +1033,7 @@ int app_generate_fix(const struct oscap_action *action)
 		}
 	}
 
+	struct oscap_source *tailoring = xccdf_session_get_user_tailoring_file(session);
 	if (action->id != NULL) {
 		/* Result-oriented fixes */
 		if (xccdf_session_build_policy_from_testresult(session, action->id) != 0)
@@ -1033,7 +1041,7 @@ int app_generate_fix(const struct oscap_action *action)
 
 		struct xccdf_policy *policy = xccdf_session_get_xccdf_policy(session);
 		struct xccdf_result *result = xccdf_policy_get_result_by_id(policy, xccdf_session_get_result_id(session));
-		if (xccdf_policy_generate_fix(policy, result, remediation_system, output_fd) == 0)
+		if (xccdf_policy_generate_fix(policy, result, remediation_system, action->f_xccdf, tailoring, output_fd) == 0)
 			ret = OSCAP_OK;
 	} else { // Fallback to profile if result id is missing
 		/* Profile-oriented fixes */
@@ -1047,7 +1055,7 @@ int app_generate_fix(const struct oscap_action *action)
 			}
 		}
 		struct xccdf_policy *policy = xccdf_session_get_xccdf_policy(session);
-		if (xccdf_policy_generate_fix(policy, NULL, remediation_system, output_fd) == 0)
+		if (xccdf_policy_generate_fix(policy, NULL, remediation_system, action->f_xccdf, tailoring, output_fd) == 0)
 			ret = OSCAP_OK;
 	}
 cleanup2:
diff --git a/utils/oscap.8 b/utils/oscap.8
index ac5f76b941..412e578982 100644
--- a/utils/oscap.8
+++ b/utils/oscap.8
@@ -415,11 +415,12 @@ ID of the XCCDF TestResult from which the report will be generated.
 Generate a script that shall bring the system to a state of compliance with given XCCDF Benchmark. There are 2 possibilities when generating fixes: Result-oriented fixes (--result-id) or Profile-oriented fixes (--profile). Result-oriented takes precedences over Profile-oriented, if result-id is given, oscap will ignore any profile provided.
 .TP
 Result-oriented fixes are generated using result-id provided to select only the failing rules from results in xccdf-file, it skips all other rules.
+It isn't possible to generate result-oriented fixes for the kickstart fix type.
 .TP
 Profile-oriented fixes are generated using all rules within the provided profile. If no result-id/profile are provided, (default) profile will be used to generate fixes.
 .TP
 \fB\-\-fix-type TYPE\fR
-Specify fix type. There are multiple programming languages in which the fix script can be generated. TYPE should be one of: bash, ansible, puppet, anaconda, ignition, kubernetes, blueprint. Default is bash.
+Specify fix type. There are multiple programming languages in which the fix script can be generated. TYPE should be one of: bash, ansible, puppet, anaconda, ignition, kubernetes, blueprint, kickstart. Default is bash.
 .TP
 \fB\-\-output FILE\fR
 Write the report to this file instead of standard output.