diff --git a/cli.c b/cli.c
index e899387..aed8f91 100644
--- a/cli.c
+++ b/cli.c
@@ -148,11 +148,11 @@ static void uci_usage(void)
 		"\tchanges    [<config>]\n"
 		"\tcommit     [<config>]\n"
 		"\tadd        <config> <section-type>\n"
-		"\tadd_list   <config>.<section>.<option>=<string>\n"
+		"\tadd_list   <config>.<section>.<option>=<string>[#<comment>]\n"
 		"\tdel_list   <config>.<section>.<option>=<string>\n"
 		"\tshow       [<config>[.<section>[.<option>]]]\n"
-		"\tget        <config>.<section>[.<option>]\n"
-		"\tset        <config>.<section>[.<option>]=<value>\n"
+		"\tget        <config>.<section>[.<option>][##]\n"
+		"\tset        <config>.<section>[.<option>]=<value>[#<comment>]]\n"
 		"\tdelete     <config>[.<section>[[.<option>][=<id>]]]\n"
 		"\trename     <config>.<section>[.<option>]=<name>\n"
 		"\trevert     <config>[.<section>[.<option>]]\n"
@@ -163,6 +163,7 @@ static void uci_usage(void)
 		"\t-C <path>  set the search path for config override files (default: "UCI_CONF2DIR")\n"
 		"\t-d <str>   set the delimiter for list values in uci show\n"
 		"\t-f <file>  use <file> as input instead of stdin\n"
+		"\t-k         keep comments of unchanged entries (export, commit)\n"
 		"\t-m         when importing, merge data into an existing package\n"
 		"\t-n         name unnamed sections on export (default)\n"
 		"\t-N         don't name unnamed sections\n"
@@ -212,7 +213,24 @@ static void uci_print_value(FILE *f, const char *v)
 	fprintf(f, "'");
 }
 
-static void uci_show_value(struct uci_option *o, bool quote)
+static void uci_print_comment(FILE *f, const char *comment)
+{
+	fputc('\'', f);
+	if (comment) {
+		for (const char *readptr = comment; *readptr; readptr++) {
+			if (*readptr != '\'')
+				fputc(*readptr, f);
+			else {
+				fputc('\'', f); /* end single-quoted string */
+				fputc('\\', f); fputc('\'', f); /* escaped single quote */
+				fputc('\'', f); /* start single-quoted string */
+			}
+		}
+	}
+	fputc('\'', f);
+}
+
+static void uci_show_option_value(struct uci_option *o, bool quote)
 {
 	struct uci_element *e;
 	bool sep = false;
@@ -224,7 +242,6 @@ static void uci_show_value(struct uci_option *o, bool quote)
 			uci_print_value(stdout, o->v.string);
 		else
 			printf("%s", o->v.string);
-		printf("\n");
 		break;
 	case UCI_TYPE_LIST:
 		uci_foreach_element(&o->v.list, e) {
@@ -236,10 +253,31 @@ static void uci_show_value(struct uci_option *o, bool quote)
 				uci_print_value(stdout, e->name);
 			sep = true;
 		}
-		printf("\n");
 		break;
 	default:
-		printf("<unknown>\n");
+		printf("<unknown>");
+		break;
+	}
+}
+
+static void uci_show_option_comment(struct uci_option *o)
+{
+	struct uci_element *e;
+	bool sep = false;
+
+	switch(o->type) {
+	case UCI_TYPE_STRING:
+		uci_print_comment(stdout, o->e.comment);
+		break;
+	case UCI_TYPE_LIST:
+		uci_foreach_element(&o->v.list, e) {
+			printf("%s", (sep ? delimiter : ""));
+			uci_print_comment(stdout, e->comment);
+			sep = true;
+		}
+		break;
+	default:
+		printf("<unknown>");
 		break;
 	}
 }
@@ -250,7 +288,12 @@ static void uci_show_option(struct uci_option *o, bool quote)
 		o->section->package->e.name,
 		(cur_section_ref ? cur_section_ref : o->section->e.name),
 		o->e.name);
-	uci_show_value(o, quote);
+	uci_show_option_value(o, quote);
+	if (ctx->flags & UCI_FLAG_COMMENTS) {
+		printf("#");
+		uci_show_option_comment(o);
+	}
+	printf("\n");
 }
 
 static void uci_show_section(struct uci_section *s)
@@ -261,7 +304,12 @@ static void uci_show_section(struct uci_section *s)
 
 	cname = s->package->e.name;
 	sname = (cur_section_ref ? cur_section_ref : s->e.name);
-	printf("%s.%s=%s\n", cname, sname, s->type);
+	printf("%s.%s=%s", cname, sname, s->type);
+	if (ctx->flags & UCI_FLAG_COMMENTS) {
+		printf("#");
+		uci_print_comment(stdout, s->e.comment);
+	}
+	printf("\n");
 	uci_foreach_element(&s->options, e) {
 		uci_show_option(uci_to_option(e), true);
 	}
@@ -488,6 +536,10 @@ static int uci_do_section_cmd(int cmd, int argc, char **argv)
 	    (cmd != CMD_RENAME) && (cmd != CMD_REORDER))
 		return 1;
 
+	if (ptr.comment && (cmd != CMD_SET) && (cmd != CMD_ADD_LIST) &&
+	    ((cmd != CMD_GET) || strcmp(ptr.comment, "#")))
+		return 1;
+
 	switch(cmd) {
 	case CMD_GET:
 		if (!(ptr.flags & UCI_LOOKUP_COMPLETE)) {
@@ -498,10 +550,20 @@ static int uci_do_section_cmd(int cmd, int argc, char **argv)
 			cli_perror();
 			return 1;
 		}
-		if (ptr.o)
-			uci_show_value(ptr.o, false);
-		else if (ptr.s)
-			printf("%s\n", ptr.s->type);
+		if (ptr.o) {
+			if (!ptr.comment)
+				uci_show_option_value(ptr.o, false);
+			else
+				uci_show_option_comment(ptr.o);
+			printf("\n");
+		}
+		else if (ptr.s) {
+			if (!ptr.comment)
+				printf("%s", ptr.s->type);
+			else
+				uci_print_comment(stdout, ptr.s->e.comment);
+			printf("\n");
+		}
 		break;
 	case CMD_RENAME:
 		ret = uci_rename(ctx, &ptr);
@@ -595,6 +657,13 @@ static int uci_batch(void)
 {
 	int ret = 0;
 
+	if (ctx->flags & UCI_FLAG_COMMENTS) {
+		/* this requires multi-line comment parsing in uci_parse_argument,
+		 * still to be implemented */
+		cli_error("'batch' not supported in combination with option '-k'\n");
+		return 1;
+	}
+
 	flags |= CLI_FLAG_BATCH;
 	while (!feof(input)) {
 		struct uci_element *e, *tmp;
@@ -697,7 +766,7 @@ int main(int argc, char **argv)
 		return 1;
 	}
 
-	while((c = getopt(argc, argv, "c:C:d:f:LmnNp:P:qsSt:X")) != -1) {
+	while((c = getopt(argc, argv, "c:C:d:f:LkmnNp:P:qsSt:X")) != -1) {
 		switch(c) {
 			case 'c':
 				uci_set_confdir(ctx, optarg);
@@ -721,6 +790,9 @@ int main(int argc, char **argv)
 					return 1;
 				}
 				break;
+			case 'k':
+				ctx->flags |= UCI_FLAG_COMMENTS;
+				break;
 			case 'm':
 				flags |= CLI_FLAG_MERGE;
 				break;
diff --git a/delta.c b/delta.c
index 5437fc1..2abc468 100644
--- a/delta.c
+++ b/delta.c
@@ -33,7 +33,7 @@
 
 /* record a change that was done to a package */
 void
-uci_add_delta(struct uci_context *ctx, struct uci_list *list, int cmd, const char *section, const char *option, const char *value)
+uci_add_delta(struct uci_context *ctx, struct uci_list *list, int cmd, const char *section, const char *option, const char *value, const char *comment)
 {
 	struct uci_delta *h;
 	int size = strlen(section) + 1;
@@ -42,7 +42,7 @@ uci_add_delta(struct uci_context *ctx, struct uci_list *list, int cmd, const cha
 	if (value)
 		size += strlen(value) + 1;
 
-	h = uci_alloc_element(ctx, delta, option, size);
+	h = uci_alloc_element(ctx, (ctx->flags & UCI_FLAG_COMMENTS) ? comment : NULL, delta, option, size);
 	ptr = uci_dataptr(h);
 	h->cmd = cmd;
 	h->section = strcpy(ptr, section);
@@ -66,6 +66,24 @@ uci_free_delta(struct uci_delta *h)
 	uci_free_element(&h->e);
 }
 
+static void uci_fprintf_escaped_comment(FILE *f, const char *comment)
+{
+	if (!comment || !comment[0])
+		return;
+
+	fputc('#', f);
+	for (const char *readptr = comment; *readptr; readptr++) {
+		if (*readptr == '\\') {
+			fputc('\\', f);
+			fputc('\\', f);
+		} else if (*readptr == '\n') {
+			fputc('\\', f);
+			fputc('n', f);
+		} else
+			fputc(*readptr, f);
+	}
+}
+
 static void uci_delta_save(struct uci_context *ctx, FILE *f,
 			const char *name, const struct uci_delta *h)
 {
@@ -92,7 +110,9 @@ static void uci_delta_save(struct uci_context *ctx, FILE *f,
 			else
 				fprintf(f, "'\\''");
 		}
-		fprintf(f, "'\n");
+		fprintf(f, "'");
+		uci_fprintf_escaped_comment(f, e->comment);
+		fprintf(f, "\n");
 	}
 }
 
@@ -114,7 +134,7 @@ int uci_set_savedir(struct uci_context *ctx, const char *dir)
 		}
 	}
 	if (!exists)
-		e = uci_alloc_generic(ctx, UCI_TYPE_PATH, dir, sizeof(struct uci_element));
+		e = uci_alloc_generic(ctx, NULL, UCI_TYPE_PATH, dir, sizeof(struct uci_element));
 	uci_list_add(&ctx->delta_path, &e->list);
 
 	sdir = uci_strdup(ctx, dir);
@@ -138,7 +158,7 @@ int uci_add_delta_path(struct uci_context *ctx, const char *dir)
 			UCI_THROW(ctx, UCI_ERR_DUPLICATE);
 	}
 
-	e = uci_alloc_generic(ctx, UCI_TYPE_PATH, dir, sizeof(struct uci_element));
+	e = uci_alloc_generic(ctx, NULL, UCI_TYPE_PATH, dir, sizeof(struct uci_element));
 	/* Keep savedir at the end of ctx->delta_path list */
 	savedir = ctx->delta_path.prev;
 	uci_list_insert(savedir->prev, &e->list);
@@ -177,6 +197,8 @@ static inline int uci_parse_delta_tuple(struct uci_context *ctx, struct uci_ptr
 		arg += 1;
 
 	UCI_INTERNAL(uci_parse_ptr, ctx, ptr, arg);
+	if (!ptr->comment && pctx->commentbuf)
+		ptr->comment = pctx->commentbuf;
 
 	if (!ptr->section)
 		goto error;
@@ -221,7 +243,7 @@ static void uci_parse_delta_line(struct uci_context *ctx, struct uci_package *p)
 		goto error;
 
 	if (ctx->flags & UCI_FLAG_SAVED_DELTA)
-		uci_add_delta(ctx, &p->saved_delta, cmd, ptr.section, ptr.option, ptr.value);
+		uci_add_delta(ctx, &p->saved_delta, cmd, ptr.section, ptr.option, ptr.value, ptr.comment);
 
 	switch(cmd) {
 	case UCI_CMD_REORDER:
@@ -393,7 +415,7 @@ static void uci_filter_delta(struct uci_context *ctx, const char *name, const ch
 
 		if (!match && ptr.section) {
 			uci_add_delta(ctx, &list, c,
-				ptr.section, ptr.option, ptr.value);
+				ptr.section, ptr.option, ptr.value, ptr.comment);
 		}
 	}
 
diff --git a/file.c b/file.c
index 6840cfc..ed1ce65 100644
--- a/file.c
+++ b/file.c
@@ -113,6 +113,88 @@ static void skip_whitespace(struct uci_context *ctx)
 		pctx->pos += 1;
 }
 
+static void uci_comment_append(struct uci_context *ctx, const char *comment)
+{
+	struct uci_parse_context *pctx = ctx->pctx;
+	const size_t len = strlen(comment);
+	const size_t requiredsz = pctx->commentlen + len + 1;
+
+	if (requiredsz > pctx->commentbufsz) {
+		pctx->commentbufsz *= 2;
+		if (requiredsz > pctx->commentbufsz)
+			pctx->commentbufsz = requiredsz;
+		pctx->commentbuf = uci_realloc(ctx, pctx->commentbuf, pctx->commentbufsz);
+	}
+
+	memcpy(pctx->commentbuf + pctx->commentlen, comment, len + 1);
+	pctx->commentlen += len;
+}
+
+/*
+ * parse a comment line before a non-comment line
+ * pctx position must be at '#'
+ */
+static void uci_parse_comment_before(struct uci_context *ctx)
+{
+	UCI_ASSERT(ctx, pctx_cur_char(ctx->pctx) == '#');
+
+	uci_comment_append(ctx, pctx_cur_str(ctx->pctx));
+}
+
+/*
+ * parse a comment at the end of a non-comment line
+ * pctx position must be at '#'
+ */
+static void uci_parse_comment_after(struct uci_context *ctx)
+{
+	struct uci_parse_context *pctx = ctx->pctx;
+	const size_t len = strlen(pctx_cur_str(pctx));
+
+	UCI_ASSERT(ctx, pctx_cur_char(pctx) == '#');
+
+	/* cut off newline if present: this indicates that it's a comment
+	 * at the end of the non-comment line instead of a comment line
+	 * before the non-comment line. */
+	if (pctx_cur_str(pctx)[len - 1] == '\n')
+		pctx_cur_str(pctx)[len - 1] = '\0';
+
+	uci_comment_append(ctx, pctx_cur_str(pctx));
+}
+
+static void uci_fprintf_comment_before(struct uci_context const *ctx, FILE *stream, const char *indent, const char *comment)
+{
+	if ((ctx->flags & UCI_FLAG_COMMENTS) && comment && comment[0]) {
+		char *newline_ptr = strrchr(comment, '\n');
+		if (newline_ptr) {
+			fprintf(stream, "%s", indent);
+			for (const char *readptr = comment; readptr <= newline_ptr; readptr++) {
+				putc(*readptr, stream);
+				if (*readptr == '\n' && readptr != newline_ptr)
+					fprintf(stream, "%s", indent);
+			}
+		}
+	}
+}
+
+static void uci_fprintf_comment_after(struct uci_context const *ctx, FILE *stream, const char *comment)
+{
+	if ((ctx->flags & UCI_FLAG_COMMENTS) && comment && comment[0]) {
+		const char *ptr = strrchr(comment, '\n');
+		ptr = ptr ? (ptr + 1) : comment;
+		if (*ptr)
+			fprintf(stream, " %s", ptr);
+	}
+}
+
+static void uci_reset_comment(struct uci_context *ctx)
+{
+	struct uci_parse_context *pctx = ctx->pctx;
+
+	if (pctx->commentbuf)
+		pctx->commentbuf[0] = '\0';
+	pctx->commentlen = 0;
+}
+
 static inline void addc(struct uci_context *ctx, size_t *pos_dest, size_t *pos_src)
 {
 	struct uci_parse_context *pctx = ctx->pctx;
@@ -211,6 +293,8 @@ static void parse_str(struct uci_context *ctx, size_t *target)
 			parse_double_quote(ctx, target);
 			break;
 		case '#':
+			if (ctx->flags & UCI_FLAG_COMMENTS)
+				uci_parse_comment_after(ctx);
 			pctx_cur_char(pctx) = 0;
 			/* fall through */
 		case 0:
@@ -290,10 +374,17 @@ int uci_parse_argument(struct uci_context *ctx, FILE *stream, char **str, char *
 		uci_getln(ctx, 0);
 	}
 
+	uci_reset_comment(ctx);
+
 	ofs_result = next_arg(ctx, false, false, false);
 	*result = pctx_str(ctx->pctx, ofs_result);
 	*str = pctx_cur_str(ctx->pctx);
 
+	if (ctx->pctx->commentbuf) {
+		uci_unescape_comment(ctx->pctx->commentbuf, true);
+		ctx->pctx->commentlen = strlen(ctx->pctx->commentbuf);
+	}
+
 	return 0;
 }
 
@@ -354,7 +445,7 @@ static void assert_eol(struct uci_context *ctx)
  * switch to a different config, either triggered by uci_load, or by a
  * 'package <...>' statement in the import file
  */
-static void uci_switch_config(struct uci_context *ctx)
+static void uci_switch_config(struct uci_context *ctx, bool with_comment)
 {
 	struct uci_parse_context *pctx;
 	struct uci_element *e;
@@ -382,7 +473,7 @@ static void uci_switch_config(struct uci_context *ctx)
 	e = uci_lookup_list(&ctx->root, name);
 	if (e)
 		UCI_THROW(ctx, UCI_ERR_DUPLICATE);
-	pctx->package = uci_alloc_package(ctx, name);
+	pctx->package = uci_alloc_package(ctx, with_comment ? pctx->commentbuf : NULL, name);
 }
 
 /*
@@ -401,11 +492,12 @@ static void uci_parse_package(struct uci_context *ctx, bool single)
 	ofs_name = next_arg(ctx, true, true, true);
 	assert_eol(ctx);
 	name = pctx_str(pctx, ofs_name);
-	if (single)
-		return;
+	if (!single) {
+		ctx->pctx->name = name;
+		uci_switch_config(ctx, true);
+	}
 
-	ctx->pctx->name = name;
-	uci_switch_config(ctx);
+	uci_reset_comment(ctx);
 }
 
 /*
@@ -424,7 +516,7 @@ static void uci_parse_config(struct uci_context *ctx)
 		if (!ctx->pctx->name)
 			uci_parse_error(ctx, "attempting to import a file without a package name");
 
-		uci_switch_config(ctx);
+		uci_switch_config(ctx, false);
 	}
 
 	/* command string null-terminated by strtok */
@@ -443,7 +535,7 @@ static void uci_parse_config(struct uci_context *ctx)
 
 	if (!name || !name[0]) {
 		ctx->internal = !pctx->merge;
-		UCI_NESTED(uci_add_section, ctx, pctx->package, type, &pctx->section);
+		UCI_NESTED(uci_add_section_with_comment, ctx, pctx->package, pctx->commentbuf, type, &pctx->section);
 	} else {
 		uci_fill_ptr(ctx, &ptr, &pctx->package->e);
 		e = uci_lookup_list(&pctx->package->sections, name);
@@ -454,6 +546,7 @@ static void uci_parse_config(struct uci_context *ctx)
 				uci_parse_error(ctx, "section of different type overwrites prior section with same name");
 		}
 
+		ptr.comment = pctx->commentbuf;
 		ptr.section = name;
 		ptr.value = type;
 
@@ -461,6 +554,8 @@ static void uci_parse_config(struct uci_context *ctx)
 		UCI_NESTED(uci_set, ctx, &ptr);
 		pctx->section = ptr.s;
 	}
+
+	uci_reset_comment(ctx);
 }
 
 /*
@@ -492,6 +587,7 @@ static void uci_parse_option(struct uci_context *ctx, bool list)
 	e = uci_lookup_list(&pctx->section->options, name);
 	if (e)
 		ptr.o = uci_to_option(e);
+	ptr.comment = pctx->commentbuf;
 	ptr.option = name;
 	ptr.value = value;
 
@@ -500,6 +596,8 @@ static void uci_parse_option(struct uci_context *ctx, bool list)
 		UCI_NESTED(uci_add_list, ctx, &ptr);
 	else
 		UCI_NESTED(uci_set, ctx, &ptr);
+
+	uci_reset_comment(ctx);
 }
 
 /*
@@ -512,6 +610,14 @@ static void uci_parse_line(struct uci_context *ctx, bool single)
 
 	/* Skip whitespace characters at the start of line */
 	skip_whitespace(ctx);
+
+	/* Keep comment line as is, do not tokenize */
+	if (pctx_cur_char(pctx) == '#') {
+		if (ctx->flags & UCI_FLAG_COMMENTS)
+			uci_parse_comment_before(ctx);
+		return;
+	}
+
 	do {
 		word = strtok(pctx_cur_str(pctx), " \t");
 		if (!word)
@@ -612,25 +718,38 @@ static void uci_export_package(struct uci_package *p, FILE *stream, bool header)
 	struct uci_context *ctx = p->ctx;
 	struct uci_element *s, *o, *i;
 
-	if (header)
-		fprintf(stream, "package %s\n", uci_escape(ctx, p->e.name));
+	if (header) {
+		uci_fprintf_comment_before(ctx, stream, "", p->e.comment);
+		fprintf(stream, "package %s", uci_escape(ctx, p->e.name));
+		uci_fprintf_comment_after(ctx, stream, p->e.comment);
+		fprintf(stream, "\n");
+	}
 	uci_foreach_element(&p->sections, s) {
 		struct uci_section *sec = uci_to_section(s);
-		fprintf(stream, "\nconfig %s", uci_escape(ctx, sec->type));
+		fprintf(stream, "\n");
+		uci_fprintf_comment_before(ctx, stream, "", sec->e.comment);
+		fprintf(stream, "config %s", uci_escape(ctx, sec->type));
 		if (!sec->anonymous || (ctx->flags & UCI_FLAG_EXPORT_NAME))
 			fprintf(stream, " '%s'", uci_escape(ctx, sec->e.name));
+		uci_fprintf_comment_after(ctx, stream, sec->e.comment);
 		fprintf(stream, "\n");
 		uci_foreach_element(&sec->options, o) {
 			struct uci_option *opt = uci_to_option(o);
 			switch(opt->type) {
 			case UCI_TYPE_STRING:
+				uci_fprintf_comment_before(ctx, stream, "\t", opt->e.comment);
 				fprintf(stream, "\toption %s", uci_escape(ctx, opt->e.name));
-				fprintf(stream, " '%s'\n", uci_escape(ctx, opt->v.string));
+				fprintf(stream, " '%s'", uci_escape(ctx, opt->v.string));
+				uci_fprintf_comment_after(ctx, stream, opt->e.comment);
+				fprintf(stream, "\n");
 				break;
 			case UCI_TYPE_LIST:
 				uci_foreach_element(&opt->v.list, i) {
+					uci_fprintf_comment_before(ctx, stream, "\t", i->comment);
 					fprintf(stream, "\tlist %s", uci_escape(ctx, opt->e.name));
-					fprintf(stream, " '%s'\n", uci_escape(ctx, i->name));
+					fprintf(stream, " '%s'", uci_escape(ctx, i->name));
+					uci_fprintf_comment_after(ctx, stream, i->comment);
+					fprintf(stream, "\n");
 				}
 				break;
 			default:
@@ -703,14 +822,14 @@ int uci_import(struct uci_context *ctx, FILE *stream, const char *name, struct u
 	}
 
 	if (!pctx->package && name)
-		uci_switch_config(ctx);
+		uci_switch_config(ctx, false);
 	if (package)
 		*package = pctx->package;
 	if (pctx->merge)
 		pctx->package = NULL;
 
 	pctx->name = NULL;
-	uci_switch_config(ctx);
+	uci_switch_config(ctx, false);
 
 	/* no error happened, we can get rid of the parser context now */
 	uci_cleanup(ctx);
diff --git a/libuci.c b/libuci.c
index 1a6b298..3d94d59 100644
--- a/libuci.c
+++ b/libuci.c
@@ -142,6 +142,9 @@ __private void uci_cleanup(struct uci_context *ctx)
 	if (pctx->package)
 		uci_free_package(&pctx->package);
 
+	if (pctx->commentbuf)
+		free(pctx->commentbuf);
+
 	if (pctx->buf)
 		free(pctx->buf);
 
diff --git a/list.c b/list.c
index 304c9e1..0ffed4e 100644
--- a/list.c
+++ b/list.c
@@ -35,7 +35,7 @@ static bool uci_list_set_pos(struct uci_list *head, struct uci_list *ptr, int po
  * payload is appended to the struct to save memory and reduce fragmentation
  */
 __private struct uci_element *
-uci_alloc_generic(struct uci_context *ctx, int type, const char *name, int size)
+uci_alloc_generic(struct uci_context *ctx, const char *comment, int type, const char *name, int size)
 {
 	struct uci_element *e;
 	int datalen = size;
@@ -43,6 +43,13 @@ uci_alloc_generic(struct uci_context *ctx, int type, const char *name, int size)
 
 	ptr = uci_malloc(ctx, datalen);
 	e = (struct uci_element *) ptr;
+	if (comment && comment[0]) {
+		UCI_TRAP_SAVE(ctx, error);
+		if (!uci_validate_comment(comment))
+			UCI_THROW(ctx, UCI_ERR_INVAL);
+		e->comment = uci_strdup(ctx, comment);
+		UCI_TRAP_RESTORE(ctx);
+	}
 	e->type = type;
 	if (name) {
 		UCI_TRAP_SAVE(ctx, error);
@@ -53,6 +60,7 @@ uci_alloc_generic(struct uci_context *ctx, int type, const char *name, int size)
 	goto done;
 
 error:
+	free(e->comment);
 	free(ptr);
 	UCI_THROW(ctx, ctx->err);
 
@@ -60,9 +68,39 @@ uci_alloc_generic(struct uci_context *ctx, int type, const char *name, int size)
 	return e;
 }
 
+static void
+uci_update_str(struct uci_context *ctx, char **pstr, const char *new)
+{
+	if (*pstr && new && new[0] && strlen(*pstr) >= strlen(new)) {
+		strcpy(*pstr, new);
+	} else {
+		if (*pstr) {
+			free(*pstr);
+			*pstr = NULL;
+		}
+
+		if (new && new[0]) {
+			UCI_TRAP_SAVE(ctx, error);
+			*pstr = uci_strdup(ctx, new);
+			UCI_TRAP_RESTORE(ctx);
+		}
+	}
+
+	return;
+error:
+	UCI_THROW(ctx, ctx->err);
+}
+
+static void
+uci_update_generic(struct uci_context *ctx, struct uci_element *e, const char *comment)
+{
+	uci_update_str(ctx, &(e->comment), comment);
+}
+
 __private void
 uci_free_element(struct uci_element *e)
 {
+	free(e->comment);
 	free(e->name);
 	if (!uci_list_empty(&e->list))
 		uci_list_del(&e->list);
@@ -70,13 +108,13 @@ uci_free_element(struct uci_element *e)
 }
 
 static struct uci_option *
-uci_alloc_option(struct uci_section *s, const char *name, const char *value, struct uci_list *after)
+uci_alloc_option(struct uci_section *s, const char *comment, const char *name, const char *value, struct uci_list *after)
 {
 	struct uci_package *p = s->package;
 	struct uci_context *ctx = p->ctx;
 	struct uci_option *o;
 
-	o = uci_alloc_element(ctx, option, name, strlen(value) + 1);
+	o = uci_alloc_element(ctx, comment, option, name, strlen(value) + 1);
 	o->type = UCI_TYPE_STRING;
 	o->v.string = uci_dataptr(o);
 	o->section = s;
@@ -86,6 +124,22 @@ uci_alloc_option(struct uci_section *s, const char *name, const char *value, str
 	return o;
 }
 
+/*
+ * Attempts to update the option without having to reallocate.
+ * Returns false on failure, in which case nothing was updated.
+ * Returns true on success.
+ */
+static bool
+uci_try_update_option(struct uci_context *ctx, struct uci_option *o, const char *comment, const char *value)
+{
+	if (o->type != UCI_TYPE_STRING || strlen(o->v.string) < strlen(value))
+		return false;
+
+	strcpy(o->v.string, value);
+	uci_update_generic(ctx, &(o->e), comment);
+	return true;
+}
+
 static inline void
 uci_free_option(struct uci_option *o)
 {
@@ -109,13 +163,13 @@ uci_free_option(struct uci_option *o)
 }
 
 static struct uci_option *
-uci_alloc_list(struct uci_section *s, const char *name, struct uci_list *after)
+uci_alloc_list(struct uci_section *s, const char *comment, const char *name, struct uci_list *after)
 {
 	struct uci_package *p = s->package;
 	struct uci_context *ctx = p->ctx;
 	struct uci_option *o;
 
-	o = uci_alloc_element(ctx, option, name, 0);
+	o = uci_alloc_element(ctx, comment, option, name, 0);
 	o->type = UCI_TYPE_LIST;
 	o->section = s;
 	uci_list_init(&o->v.list);
@@ -195,7 +249,7 @@ static void uci_section_transfer_options(struct uci_section *dst, struct uci_sec
 }
 
 static struct uci_section *
-uci_alloc_section(struct uci_package *p, const char *type, const char *name, struct uci_list *after)
+uci_alloc_section(struct uci_package *p, const char *comment, const char *type, const char *name, struct uci_list *after)
 {
 	struct uci_context *ctx = p->ctx;
 	struct uci_section *s;
@@ -203,7 +257,7 @@ uci_alloc_section(struct uci_package *p, const char *type, const char *name, str
 	if (name && !name[0])
 		name = NULL;
 
-	s = uci_alloc_element(ctx, section, name, strlen(type) + 1);
+	s = uci_alloc_element(ctx, comment, section, name, strlen(type) + 1);
 	uci_list_init(&s->options);
 	s->type = uci_dataptr(s);
 	s->package = p;
@@ -217,6 +271,23 @@ uci_alloc_section(struct uci_package *p, const char *type, const char *name, str
 	return s;
 }
 
+/*
+ * Attempts to update the section without having to reallocate.
+ * Returns false on failure, in which case nothing was updated.
+ * Returns true on success.
+ */
+static bool
+uci_try_update_section(struct uci_context *ctx, struct uci_section *s, const char *comment, const char *type)
+{
+	if (strlen(s->type) < strlen(type))
+		/* need to realloc entire option */
+		return false;
+
+	strcpy(s->type, type);
+	uci_update_generic(ctx, &(s->e), comment);
+	return true;
+}
+
 static void
 uci_free_section(struct uci_section *s)
 {
@@ -232,11 +303,11 @@ uci_free_section(struct uci_section *s)
 }
 
 __private struct uci_package *
-uci_alloc_package(struct uci_context *ctx, const char *name)
+uci_alloc_package(struct uci_context *ctx, const char *comment, const char *name)
 {
 	struct uci_package *p;
 
-	p = uci_alloc_element(ctx, package, name, 0);
+	p = uci_alloc_element(ctx, comment, package, name, 0);
 	p->ctx = ctx;
 	uci_list_init(&p->sections);
 	uci_list_init(&p->delta);
@@ -500,7 +571,7 @@ int uci_rename(struct uci_context *ctx, struct uci_ptr *ptr)
 	UCI_ASSERT(ctx, ptr->value);
 
 	if (!internal && p->has_delta)
-		uci_add_delta(ctx, &p->delta, UCI_CMD_RENAME, ptr->section, ptr->option, ptr->value);
+		uci_add_delta(ctx, &p->delta, UCI_CMD_RENAME, ptr->section, ptr->option, ptr->value, NULL);
 
 	n = uci_strdup(ctx, ptr->value);
 	free(e->name);
@@ -524,29 +595,35 @@ int uci_reorder_section(struct uci_context *ctx, struct uci_section *s, int pos)
 	changed = uci_list_set_pos(&s->package->sections, &s->e.list, pos);
 	if (!internal && p->has_delta && changed) {
 		sprintf(order, "%d", pos);
-		uci_add_delta(ctx, &p->delta, UCI_CMD_REORDER, s->e.name, NULL, order);
+		uci_add_delta(ctx, &p->delta, UCI_CMD_REORDER, s->e.name, NULL, order, NULL);
 	}
 
 	return 0;
 }
 
-int uci_add_section(struct uci_context *ctx, struct uci_package *p, const char *type, struct uci_section **res)
+__private int
+uci_add_section_with_comment(struct uci_context *ctx, struct uci_package *p, const char *comment, const char *type, struct uci_section **res)
 {
 	bool internal = ctx && ctx->internal;
 	struct uci_section *s;
 
 	UCI_HANDLE_ERR(ctx);
 	UCI_ASSERT(ctx, p != NULL);
-	s = uci_alloc_section(p, type, NULL, NULL);
+	s = uci_alloc_section(p, comment, type, NULL, NULL);
 	if (s && s->anonymous)
 		uci_fixup_section(ctx, s);
 	*res = s;
 	if (!internal && p->has_delta)
-		uci_add_delta(ctx, &p->delta, UCI_CMD_ADD, s->e.name, NULL, type);
+		uci_add_delta(ctx, &p->delta, UCI_CMD_ADD, s->e.name, NULL, type, s->e.comment);
 
 	return 0;
 }
 
+int uci_add_section(struct uci_context *ctx, struct uci_package *p, const char *type, struct uci_section **res)
+{
+	return uci_add_section_with_comment(ctx, p, NULL, type, res);
+}
+
 int uci_delete(struct uci_context *ctx, struct uci_ptr *ptr)
 {
 	/* NB: pass on internal flag to uci_del_element */
@@ -569,7 +646,7 @@ int uci_delete(struct uci_context *ctx, struct uci_ptr *ptr)
 		uci_foreach_element_safe(&ptr->o->v.list, tmp, e2) {
 			if (index == 0) {
 				if (!internal && p->has_delta)
-					uci_add_delta(ctx, &p->delta, UCI_CMD_REMOVE, ptr->section, ptr->option, ptr->value);
+					uci_add_delta(ctx, &p->delta, UCI_CMD_REMOVE, ptr->section, ptr->option, ptr->value, NULL);
 				uci_free_option(uci_to_option(e2));
 				return 0;
 			}
@@ -580,7 +657,7 @@ int uci_delete(struct uci_context *ctx, struct uci_ptr *ptr)
 	}
 
 	if (!internal && p->has_delta)
-		uci_add_delta(ctx, &p->delta, UCI_CMD_REMOVE, ptr->section, ptr->option, NULL);
+		uci_add_delta(ctx, &p->delta, UCI_CMD_REMOVE, ptr->section, ptr->option, NULL, NULL);
 
 	uci_free_any(&e1);
 
@@ -609,19 +686,19 @@ int uci_add_list(struct uci_context *ctx, struct uci_ptr *ptr)
 	}
 
 	/* create new item */
-	e1 = uci_alloc_generic(ctx, UCI_TYPE_ITEM, ptr->value, sizeof(struct uci_option));
+	e1 = uci_alloc_generic(ctx, ptr->comment, UCI_TYPE_ITEM, ptr->value, sizeof(struct uci_option));
 
 	if (!ptr->o) {
 		/* create new list */
 		UCI_TRAP_SAVE(ctx, error);
-		ptr->o = uci_alloc_list(ptr->s, ptr->option, NULL);
+		ptr->o = uci_alloc_list(ptr->s, ptr->comment, ptr->option, NULL);
 		UCI_TRAP_RESTORE(ctx);
 	} else if (ptr->o->type == UCI_TYPE_STRING) {
 		/* create new list and add old string value as item to list */
 		struct uci_option *old = ptr->o;
 		UCI_TRAP_SAVE(ctx, error);
-		e2 = uci_alloc_generic(ctx, UCI_TYPE_ITEM, old->v.string, sizeof(struct uci_option));
-		ptr->o = uci_alloc_list(ptr->s, ptr->option, &old->e.list);
+		e2 = uci_alloc_generic(ctx, old->e.comment, UCI_TYPE_ITEM, old->v.string, sizeof(struct uci_option));
+		ptr->o = uci_alloc_list(ptr->s, ptr->comment, ptr->option, &old->e.list);
 		UCI_TRAP_RESTORE(ctx);
 		uci_list_add(&ptr->o->v.list, &e2->list);
 
@@ -635,7 +712,7 @@ int uci_add_list(struct uci_context *ctx, struct uci_ptr *ptr)
 	uci_list_add(&ptr->o->v.list, &e1->list);
 
 	if (!internal && ptr->p->has_delta)
-		uci_add_delta(ctx, &ptr->p->delta, UCI_CMD_LIST_ADD, ptr->section, ptr->option, ptr->value);
+		uci_add_delta(ctx, &ptr->p->delta, UCI_CMD_LIST_ADD, ptr->section, ptr->option, ptr->value, ptr->comment);
 
 	return 0;
 error:
@@ -667,7 +744,7 @@ int uci_del_list(struct uci_context *ctx, struct uci_ptr *ptr)
 
 	p = ptr->p;
 	if (!internal && p->has_delta)
-		uci_add_delta(ctx, &p->delta, UCI_CMD_LIST_DEL, ptr->section, ptr->option, ptr->value);
+		uci_add_delta(ctx, &p->delta, UCI_CMD_LIST_DEL, ptr->section, ptr->option, ptr->value, NULL);
 
 	uci_foreach_element_safe(&ptr->o->v.list, tmp, e) {
 		if (!strcmp(ptr->value, uci_to_option(e)->e.name)) {
@@ -705,31 +782,23 @@ int uci_set(struct uci_context *ctx, struct uci_ptr *ptr)
 
 		return uci_delete(ctx, ptr);
 	} else if (!ptr->o && ptr->option) { /* new option */
-		ptr->o = uci_alloc_option(ptr->s, ptr->option, ptr->value, NULL);
+		ptr->o = uci_alloc_option(ptr->s, ptr->comment, ptr->option, ptr->value, NULL);
 	} else if (!ptr->s && ptr->section) { /* new section */
-		ptr->s = uci_alloc_section(ptr->p, ptr->value, ptr->section, NULL);
+		ptr->s = uci_alloc_section(ptr->p, ptr->comment, ptr->value, ptr->section, NULL);
 	} else if (ptr->o && ptr->option) { /* update option */
-		if (ptr->o->type == UCI_TYPE_STRING && !strcmp(ptr->o->v.string, ptr->value))
-			return 0;
-
-		if (ptr->o->type == UCI_TYPE_STRING && strlen(ptr->o->v.string) == strlen(ptr->value)) {
-			strcpy(ptr->o->v.string, ptr->value);
-		} else {
+		/* value, list values, comment may have changed */
+		if (!uci_try_update_option(ctx, ptr->o, ptr->comment, ptr->value)) {
 			struct uci_option *old = ptr->o;
-			ptr->o = uci_alloc_option(ptr->s, ptr->option, ptr->value, &old->e.list);
+			ptr->o = uci_alloc_option(ptr->s, ptr->comment, ptr->option, ptr->value, &old->e.list);
 			if (ptr->option == old->e.name)
 				ptr->option = ptr->o->e.name;
 			uci_free_option(old);
 		}
 	} else if (ptr->s && ptr->section) { /* update section */
-		if (!strcmp(ptr->s->type, ptr->value))
-			return 0;
-
-		if (strlen(ptr->s->type) == strlen(ptr->value)) {
-			strcpy(ptr->s->type, ptr->value);
-		} else {
+		/* type, comment may have changed */
+		if (!uci_try_update_section(ctx, ptr->s, ptr->comment, ptr->value)) {
 			struct uci_section *old = ptr->s;
-			ptr->s = uci_alloc_section(ptr->p, ptr->value, old->e.name, &old->e.list);
+			ptr->s = uci_alloc_section(ptr->p, old->e.comment, ptr->value, old->e.name, &old->e.list);
 			uci_section_transfer_options(ptr->s, old);
 			if (ptr->section == old->e.name)
 				ptr->section = ptr->s->e.name;
@@ -741,7 +810,7 @@ int uci_set(struct uci_context *ctx, struct uci_ptr *ptr)
 	}
 
 	if (!internal && ptr->p->has_delta)
-		uci_add_delta(ctx, &ptr->p->delta, UCI_CMD_CHANGE, ptr->section, ptr->option, ptr->value);
+		uci_add_delta(ctx, &ptr->p->delta, UCI_CMD_CHANGE, ptr->section, ptr->option, ptr->value, ptr->comment);
 
 	return 0;
 }
diff --git a/scripts/devel-build.sh b/scripts/devel-build.sh
index d40b273..8d997f3 100755
--- a/scripts/devel-build.sh
+++ b/scripts/devel-build.sh
@@ -87,6 +87,8 @@ make -C "${BUILDDIR}" test CTEST_OUTPUT_ON_FAILURE=1
 
 set +x
 echo "✅ Success - uci is available at ${BUILDDIR}"
+echo "👷 The test log is available at ${BUILDDIR}/Testing/Temporary/LastTest.log"
 echo "👷 You can rebuild uci by running 'make -C build'"
+echo ""
 
 exit 0
diff --git a/tests/shunit2/references/add_list_keep_comments.data b/tests/shunit2/references/add_list_keep_comments.data
new file mode 100644
index 0000000..ffb6acd
--- /dev/null
+++ b/tests/shunit2/references/add_list_keep_comments.data
@@ -0,0 +1,23 @@
+# before
+config named 'section'
+	# before
+	option opt 'val'
+
+	option opt2 'val2' # after1
+
+	#before1
+	#before2
+	option opt3 'val3' # after2
+
+config named 'section2' # after3
+
+#before3
+#before4
+config named 'section3' # after4
+
+#before5
+#before6
+config named 'section4' # after5
+	#before7
+	#before8
+	option opt3 'val3' # after6
diff --git a/tests/shunit2/references/add_list_keep_comments.result b/tests/shunit2/references/add_list_keep_comments.result
new file mode 100644
index 0000000..36e1f48
--- /dev/null
+++ b/tests/shunit2/references/add_list_keep_comments.result
@@ -0,0 +1,25 @@
+
+# before
+config named 'section'
+	# before
+	option opt 'val'
+	option opt2 'val2' # after1
+	#before1
+	#before2
+	option opt3 'val3' # after2
+	list listopt 'val'
+	list listopt 'val2'
+
+config named 'section2' # after3
+
+#before3
+#before4
+config named 'section3' # after4
+
+#before5
+#before6
+config named 'section4' # after5
+	#before7
+	#before8
+	option opt3 'val3' # after6
+
diff --git a/tests/shunit2/references/del_list_keep_comments.data b/tests/shunit2/references/del_list_keep_comments.data
new file mode 100644
index 0000000..07b13e8
--- /dev/null
+++ b/tests/shunit2/references/del_list_keep_comments.data
@@ -0,0 +1,20 @@
+
+# comment before section
+config named 'section' # comment after section
+	# comment before opt
+	option opt 'optval' # comment after opt
+	#before1
+	list listopt 'val'
+	#before1
+	#before2
+	list listopt 'val2'
+	list listopt 'val3' #after
+	#before1
+	list listopt 'val4' #after
+	#before1
+	#before2
+	list listopt 'val5' #after
+	#be\fore1
+	#be\fore2
+	list listopt 'val6' #af\ter
+
diff --git a/tests/shunit2/references/del_list_keep_comments.result b/tests/shunit2/references/del_list_keep_comments.result
new file mode 100644
index 0000000..4bc9a36
--- /dev/null
+++ b/tests/shunit2/references/del_list_keep_comments.result
@@ -0,0 +1,6 @@
+
+# comment before section
+config named 'section' # comment after section
+	# comment before opt
+	option opt 'optval' # comment after opt
+
diff --git a/tests/shunit2/references/delete_option.data b/tests/shunit2/references/delete_option.data
new file mode 100644
index 0000000..823924b
--- /dev/null
+++ b/tests/shunit2/references/delete_option.data
@@ -0,0 +1,13 @@
+
+config type 'section1'
+	option opt 'val'
+	option opt2 'val2'
+	list listopt 'val3'
+	list listopt 'val4'
+
+config type 'section2'
+	option opt 'val'
+	option opt2 'val2'
+	list listopt 'val3'
+	list listopt 'val4'
+
diff --git a/tests/shunit2/references/delete_option.result b/tests/shunit2/references/delete_option.result
new file mode 100644
index 0000000..0e5075f
--- /dev/null
+++ b/tests/shunit2/references/delete_option.result
@@ -0,0 +1,10 @@
+
+config type 'section1'
+	option opt2 'val2'
+
+config type 'section2'
+	option opt 'val'
+	option opt2 'val2'
+	list listopt 'val3'
+	list listopt 'val4'
+
diff --git a/tests/shunit2/references/delete_option_keep_comments.data b/tests/shunit2/references/delete_option_keep_comments.data
new file mode 100644
index 0000000..9fa1142
--- /dev/null
+++ b/tests/shunit2/references/delete_option_keep_comments.data
@@ -0,0 +1,24 @@
+
+# comment 1
+config type 'section1' # comment 2
+	# comment 3
+	option opt 'val' # comment 4
+	option opt2 'val2' # comment 5
+# comment 6
+	list listopt 'val3' # comment 7
+	# comment 8
+	# comment 9
+	list listopt 'val4' # comment 10
+
+# comment 11
+#
+  # comment 12
+config type 'section2' # comment 13
+	option opt 'val'
+	# comment 14
+	# comment 15
+	option opt2 'val2'
+	list listopt 'val3' # comment 16
+	# comment 17
+	list listopt 'val4' # comment 18
+
diff --git a/tests/shunit2/references/delete_option_keep_comments.result b/tests/shunit2/references/delete_option_keep_comments.result
new file mode 100644
index 0000000..8d9197f
--- /dev/null
+++ b/tests/shunit2/references/delete_option_keep_comments.result
@@ -0,0 +1,17 @@
+
+# comment 1
+config type 'section1' # comment 2
+	option opt2 'val2' # comment 5
+
+# comment 11
+#
+# comment 12
+config type 'section2' # comment 13
+	option opt 'val'
+	# comment 14
+	# comment 15
+	option opt2 'val2'
+	list listopt 'val3' # comment 16
+	# comment 17
+	list listopt 'val4' # comment 18
+
diff --git a/tests/shunit2/references/delete_section.data b/tests/shunit2/references/delete_section.data
new file mode 100644
index 0000000..de687e9
--- /dev/null
+++ b/tests/shunit2/references/delete_section.data
@@ -0,0 +1,12 @@
+config type 'section'
+	option opt 'val'
+	option opt2 'val2'
+
+config type 'section2'
+	option opt3 'val3'
+	option opt4 'val4'
+
+
+config type 'section3'
+	option opt3 'val5'
+	option opt4 'val6'
diff --git a/tests/shunit2/references/delete_section.result b/tests/shunit2/references/delete_section.result
new file mode 100644
index 0000000..c12d3ec
--- /dev/null
+++ b/tests/shunit2/references/delete_section.result
@@ -0,0 +1,9 @@
+
+config type 'section'
+	option opt 'val'
+	option opt2 'val2'
+
+config type 'section3'
+	option opt3 'val5'
+	option opt4 'val6'
+
diff --git a/tests/shunit2/references/delete_section_keep_comments.data b/tests/shunit2/references/delete_section_keep_comments.data
new file mode 100644
index 0000000..e010415
--- /dev/null
+++ b/tests/shunit2/references/delete_section_keep_comments.data
@@ -0,0 +1,18 @@
+# comment 1
+# comment 2
+config type 'section' # comment 3
+	# comment 4
+	option opt 'val' # comment 5
+	option opt2 'val2' # comment 6 
+
+# comment 7
+config type 'section2' # comment 8
+	option opt3 'val3' # comment 9
+	# comment 10
+	option opt4 'val4' # comment 11
+
+ # comment 12
+config type 'section3'
+	option opt3 'val5'  # comment 13
+# comment 14
+	option opt4 'val6'
diff --git a/tests/shunit2/references/delete_section_keep_comments.result b/tests/shunit2/references/delete_section_keep_comments.result
new file mode 100644
index 0000000..590d484
--- /dev/null
+++ b/tests/shunit2/references/delete_section_keep_comments.result
@@ -0,0 +1,14 @@
+
+# comment 1
+# comment 2
+config type 'section' # comment 3
+	# comment 4
+	option opt 'val' # comment 5
+	option opt2 'val2' # comment 6 
+
+# comment 12
+config type 'section3'
+	option opt3 'val5' # comment 13
+	# comment 14
+	option opt4 'val6'
+
diff --git a/tests/shunit2/references/export_keep_comments.data b/tests/shunit2/references/export_keep_comments.data
new file mode 100644
index 0000000..cd8d514
--- /dev/null
+++ b/tests/shunit2/references/export_keep_comments.data
@@ -0,0 +1,23 @@
+
+# lots
+             #  of
+	#   comment
+#    lines
+config 'type' 'section'
+	option 'opt' 'val'
+	list 'list_opt' 'val0'
+	list 'list_opt' 'val1'               	###### another comment after val1
+# lots
+             # more
+	# comment
+# lines
+	option mul_line_opt_sq 'line 1
+line 2 \
+line 3'
+	option mul_line_opt_dq "\"Hello\, \
+World.\'
+"
+
+# comment lines
+# that are
+# lost...
diff --git a/tests/shunit2/references/export_keep_comments.result b/tests/shunit2/references/export_keep_comments.result
new file mode 100644
index 0000000..23f3c76
--- /dev/null
+++ b/tests/shunit2/references/export_keep_comments.result
@@ -0,0 +1,20 @@
+package export
+
+# lots
+#  of
+#   comment
+#    lines
+config type 'section'
+	option opt 'val'
+	list list_opt 'val0'
+	list list_opt 'val1' ###### another comment after val1
+	# lots
+	# more
+	# comment
+	# lines
+	option mul_line_opt_sq 'line 1
+line 2 \
+line 3'
+	option mul_line_opt_dq '"Hello, World.'\''
+'
+
diff --git a/tests/shunit2/references/import_merge.data b/tests/shunit2/references/import_merge.data
new file mode 100644
index 0000000..0a313c7
--- /dev/null
+++ b/tests/shunit2/references/import_merge.data
@@ -0,0 +1,10 @@
+config type 'section1'
+	option 'opt' 'val'
+
+	list 'list_opt' 'val0'
+	list 'list_opt' 'val1'
+
+config type 'section3'
+	option 'opt' 'val4'
+	list 'list_opt' 'val5'
+	list 'list_opt' 'val6'
diff --git a/tests/shunit2/references/import_merge.result b/tests/shunit2/references/import_merge.result
new file mode 100644
index 0000000..ff01c3d
--- /dev/null
+++ b/tests/shunit2/references/import_merge.result
@@ -0,0 +1,17 @@
+
+config type 'section1'
+	option opt 'val'
+	list list_opt 'val0'
+	list list_opt 'val1'
+
+config type 'section3'
+	option opt 'val7'
+	list list_opt 'val5'
+	list list_opt 'val6'
+	option opt2 'val8'
+
+config type 'section2'
+	option opt 'val4'
+	list list_opt 'val5'
+	list list_opt 'val6'
+
diff --git a/tests/shunit2/references/import_merge_import.data b/tests/shunit2/references/import_merge_import.data
new file mode 100644
index 0000000..6d9cd62
--- /dev/null
+++ b/tests/shunit2/references/import_merge_import.data
@@ -0,0 +1,11 @@
+package 'import-test'
+
+config type 'section2'
+	option 'opt' 'val4'
+	list 'list_opt' 'val5'
+	list 'list_opt' 'val6'
+
+config type 'section3'
+	option 'opt' 'val7'
+	option 'opt2' 'val8'
+
diff --git a/tests/shunit2/references/import_merge_keep_comments.data b/tests/shunit2/references/import_merge_keep_comments.data
new file mode 100644
index 0000000..d6f0066
--- /dev/null
+++ b/tests/shunit2/references/import_merge_keep_comments.data
@@ -0,0 +1,34 @@
+# before config type 'section'
+
+config type 'section'                # after config type 'section'
+	# before option 'opt'
+	option 'opt' 'val' # after option 'opt'
+# before list 'list_opt' 'val0' line 1
+
+	# before list 'list_opt' 'val0' line 2
+	list 'list_opt' 'val0' # after list 'list_opt' 'val0'
+	list 'list_opt' 'val1'
+	option mul_line_opt_sq \''line 1
+line 2 \
+line 3'\' # comment after mul_line_opt_sq
+	option mul_line_opt_dq "\"Hello, \
+World.\'
+" # comment after mul_line_opt_dq
+
+config type 'section3'                # after config type 'section'
+	# before option 'opt'
+	option 'opt' 'val4' # after option 'opt'
+# before list 'list_opt' 'val5' line 1
+
+	# before list 'list_opt' 'val5' line 2
+	list 'list_opt' 'val5' # after list 'list_opt' 'val5'
+	list 'list_opt' 'val6'
+        # comment before mul_line_opt_sq
+	option mul_line_opt_sq \''line 1
+line 2a \
+line 3a'\' # comment after mul_line_opt_sq 2
+	option mul_line_opt_dq "\"Hello, \
+World2.\'
+" # comment after mul_line_opt_dq 2
+
+# this original comment at the end of the file should not be kept
diff --git a/tests/shunit2/references/import_merge_keep_comments.result b/tests/shunit2/references/import_merge_keep_comments.result
new file mode 100644
index 0000000..d95bb8c
--- /dev/null
+++ b/tests/shunit2/references/import_merge_keep_comments.result
@@ -0,0 +1,34 @@
+
+# before config type 'section'
+config type 'section' # after config type 'section'
+	# before option 'opt'
+	option opt 'val' # after option 'opt'
+	# before list 'list_opt' 'val0' line 1
+	# before list 'list_opt' 'val0' line 2
+	list list_opt 'val0' # after list 'list_opt' 'val0'
+	list list_opt 'val1'
+	option mul_line_opt_sq ''\''line 1
+line 2 \
+line 3'\''' # comment after mul_line_opt_sq
+	option mul_line_opt_dq '"Hello, World.'\''
+' # comment after mul_line_opt_dq
+
+config type 'section3'
+	option opt 'val7'
+	# before list 'list_opt' 'val5' line 1
+	# before list 'list_opt' 'val5' line 2
+	list list_opt 'val5' # after list 'list_opt' 'val5'
+	list list_opt 'val6'
+	# comment before mul_line_opt_sq
+	option mul_line_opt_sq ''\''line 1
+line 2a \
+line 3a'\''' # comment after mul_line_opt_sq 2
+	option mul_line_opt_dq '"Hello, World2.'\''
+' # comment after mul_line_opt_dq 2
+	option opt2 'val8'
+
+config type 'section2'
+	option opt 'val4'
+	list list_opt 'val5'
+	list list_opt 'val6'
+
diff --git a/tests/shunit2/references/import_merge_keep_comments_import.data b/tests/shunit2/references/import_merge_keep_comments_import.data
new file mode 100644
index 0000000..6d9cd62
--- /dev/null
+++ b/tests/shunit2/references/import_merge_keep_comments_import.data
@@ -0,0 +1,11 @@
+package 'import-test'
+
+config type 'section2'
+	option 'opt' 'val4'
+	list 'list_opt' 'val5'
+	list 'list_opt' 'val6'
+
+config type 'section3'
+	option 'opt' 'val7'
+	option 'opt2' 'val8'
+
diff --git a/tests/shunit2/references/import_merge_with_comments.changes1 b/tests/shunit2/references/import_merge_with_comments.changes1
new file mode 100644
index 0000000..1333ed7
--- /dev/null
+++ b/tests/shunit2/references/import_merge_with_comments.changes1
@@ -0,0 +1 @@
+TODO
diff --git a/tests/shunit2/references/import_merge_with_comments.data b/tests/shunit2/references/import_merge_with_comments.data
new file mode 100644
index 0000000..ac72ca3
--- /dev/null
+++ b/tests/shunit2/references/import_merge_with_comments.data
@@ -0,0 +1,20 @@
+package 'import-test'
+
+# 2before config type 'section'
+config type 'section' # 2after config type 'section'
+	# before option 'opt'
+	option opt 'optval' # after option 'opt'
+	# before
+	list list_opt 'val7' # after
+	list list_opt 'differentval'
+	option mul_line_opt_sq ''\''line 1
+line 2 \
+line 3'\''' # comment after mul_line_opt_sq
+	option mul_line_opt_dq '"Hello, World.'\''
+' # 2comment after mul_line_opt_dq
+	option newopt 'newval'
+
+# 1somecomment before
+config type 'section2' # 1somecomment after
+	# 2somecomment before
+	option opt2 'val2' # 2somecomment after
diff --git a/tests/shunit2/references/import_merge_with_comments.result1 b/tests/shunit2/references/import_merge_with_comments.result1
new file mode 100644
index 0000000..7f1c0f2
--- /dev/null
+++ b/tests/shunit2/references/import_merge_with_comments.result1
@@ -0,0 +1,19 @@
+
+# before config type 'section'
+config type 'section' # after config type 'section'
+	# before option 'opt'
+	option opt 'val' # after option 'opt'
+	# before list 'list_opt' 'val0' line 1
+	# before list 'list_opt' 'val0' line 2
+	list list_opt 'val0' # after list 'list_opt' 'val0'
+	list list_opt 'val1'
+	# before list 'list_opt' 'val0' line 1
+	# before list 'list_opt' 'val0' line 2
+	list list_opt 'val0' # after list 'list_opt' 'val0'
+	list list_opt 'val1'
+	option mul_line_opt_sq ''\''line 1
+line 2 \
+line 3'\''' # comment after mul_line_opt_sq
+	option mul_line_opt_dq '"Hello, World.'\''
+' # comment after mul_line_opt_dq
+
diff --git a/tests/shunit2/references/import_merge_with_comments.result2 b/tests/shunit2/references/import_merge_with_comments.result2
new file mode 100644
index 0000000..b01eeb1
--- /dev/null
+++ b/tests/shunit2/references/import_merge_with_comments.result2
@@ -0,0 +1,28 @@
+
+# 2before config type 'section'
+config type 'section' # 2after config type 'section'
+	# before option 'opt'
+	option opt 'optval' # after option 'opt'
+	# before list 'list_opt' 'val0' line 1
+	# before list 'list_opt' 'val0' line 2
+	list list_opt 'val0' # after list 'list_opt' 'val0'
+	list list_opt 'val1'
+	# before list 'list_opt' 'val0' line 1
+	# before list 'list_opt' 'val0' line 2
+	list list_opt 'val0' # after list 'list_opt' 'val0'
+	list list_opt 'val1'
+	# before
+	list list_opt 'val7' # after
+	list list_opt 'differentval'
+	option mul_line_opt_sq ''\''line 1
+line 2 \
+line 3'\''' # comment after mul_line_opt_sq
+	option mul_line_opt_dq '"Hello, World.'\''
+' # 2comment after mul_line_opt_dq
+	option newopt 'newval'
+
+# 1somecomment before
+config type 'section2' # 1somecomment after
+	# 2somecomment before
+	option opt2 'val2' # 2somecomment after
+
diff --git a/tests/shunit2/references/import_with_comments.data b/tests/shunit2/references/import_with_comments.data
new file mode 100644
index 0000000..a4167ce
--- /dev/null
+++ b/tests/shunit2/references/import_with_comments.data
@@ -0,0 +1,20 @@
+# before package 'import-test' line 1
+# before package 'import-test' line 2
+package 'import-test' # after package 'import-test'
+
+# before config type 'section'
+
+config type 'section'                # after config type 'section'
+	# before option 'opt'
+	option 'opt' 'val' # after option 'opt'
+# before list 'list_opt' 'val0' line 1
+
+	# before list 'list_opt' 'val0' line 2
+	list 'list_opt' 'val0' # after list 'list_opt' 'val0'
+	list 'list_opt' 'val1'
+	option mul_line_opt_sq \''line 1
+line 2 \
+line 3'\' # comment after mul_line_opt_sq
+	option mul_line_opt_dq "\"Hello, \
+World.\'
+" # comment after mul_line_opt_dq
diff --git a/tests/shunit2/references/import_with_comments.result b/tests/shunit2/references/import_with_comments.result
new file mode 100644
index 0000000..88a9ec0
--- /dev/null
+++ b/tests/shunit2/references/import_with_comments.result
@@ -0,0 +1,15 @@
+
+# before config type 'section'
+config type 'section' # after config type 'section'
+	# before option 'opt'
+	option opt 'val' # after option 'opt'
+	# before list 'list_opt' 'val0' line 1
+	# before list 'list_opt' 'val0' line 2
+	list list_opt 'val0' # after list 'list_opt' 'val0'
+	list list_opt 'val1'
+	option mul_line_opt_sq ''\''line 1
+line 2 \
+line 3'\''' # comment after mul_line_opt_sq
+	option mul_line_opt_dq '"Hello, World.'\''
+' # comment after mul_line_opt_dq
+
diff --git a/tests/shunit2/references/set_keep_comments.data b/tests/shunit2/references/set_keep_comments.data
new file mode 100644
index 0000000..ffb6acd
--- /dev/null
+++ b/tests/shunit2/references/set_keep_comments.data
@@ -0,0 +1,23 @@
+# before
+config named 'section'
+	# before
+	option opt 'val'
+
+	option opt2 'val2' # after1
+
+	#before1
+	#before2
+	option opt3 'val3' # after2
+
+config named 'section2' # after3
+
+#before3
+#before4
+config named 'section3' # after4
+
+#before5
+#before6
+config named 'section4' # after5
+	#before7
+	#before8
+	option opt3 'val3' # after6
diff --git a/tests/shunit2/references/set_keep_comments.result b/tests/shunit2/references/set_keep_comments.result
new file mode 100644
index 0000000..fae3524
--- /dev/null
+++ b/tests/shunit2/references/set_keep_comments.result
@@ -0,0 +1,17 @@
+
+config named 'section'
+	option opt 'val'
+	option opt2 'val'
+	option opt3 'val'
+
+config named 'section2'
+
+config named 'section3'
+
+#before5
+#before6
+config named 'section4' # after5
+	#before7
+	#before8
+	option opt3 'val3' # after6
+
diff --git a/tests/shunit2/tests.d/000_import b/tests/shunit2/tests.d/000_import
index 45a1448..ac90df7 100644
--- a/tests/shunit2/tests.d/000_import
+++ b/tests/shunit2/tests.d/000_import
@@ -1,5 +1,62 @@
 test_import ()
 {
 	${UCI} import < ${REF_DIR}/import.data
+	assertTrue $?
 	assertSameFile ${REF_DIR}/import.result ${CONFIG_DIR}/import-test
 }
+
+make_abspath()
+{
+	# this should work with /bin/sh
+	echo "$(cd -- "$(dirname "$1")"; pwd)/$(basename "$1")"
+}
+
+test_import_merge ()
+{
+	cp "${REF_DIR}/import_merge.data" "${CONFIG_DIR}/import-test"
+        # if the full path of the config file is specified, 'import' applies
+        # the changes immediately without requiring a commit.
+	ABSPATH="$(make_abspath "${CONFIG_DIR}/import-test")"
+	${UCI} -m import "${ABSPATH}" < "${REF_DIR}/import_merge_import.data"
+	assertTrue $?
+	assertSameFile "${REF_DIR}/import_merge.result" "${CONFIG_DIR}/import-test"
+}
+
+test_import_merge_keep_comments ()
+{
+	cp "${REF_DIR}/import_merge_keep_comments.data" "${CONFIG_DIR}/import-test"
+        # if the full path of the config file is specified, 'import' applies
+        # the changes immediately without requiring a commit.
+	ABSPATH="$(make_abspath "${CONFIG_DIR}/import-test")"
+	${UCI} -k -m import "${ABSPATH}" < "${REF_DIR}/import_merge_keep_comments_import.data"
+	assertTrue $?
+	assertSameFile "${REF_DIR}/import_merge_keep_comments.result" "${CONFIG_DIR}/import-test"
+}
+
+test_import_with_comments ()
+{
+	${UCI} -k import < "${REF_DIR}/import_with_comments.data"
+	assertTrue $?
+	assertSameFile "${REF_DIR}/import_with_comments.result" "${CONFIG_DIR}/import-test"
+}
+
+test_import_merge_with_comments ()
+{
+	${UCI} -k import < "${REF_DIR}/import_with_comments.data"
+	assertTrue $?
+	assertSameFile ${REF_DIR}/import_with_comments.result ${CONFIG_DIR}/import-test
+
+	# merge the same data again: list entries should be appended again
+	${UCI} -k -m import import-test < "${REF_DIR}/import_with_comments.data"
+	assertTrue $?
+	${UCI} -k commit
+	assertTrue $?
+	assertSameFile "${REF_DIR}/import_merge_with_comments.result1" "${CONFIG_DIR}/import-test"
+
+	# merge different data
+	${UCI} -k -m import import-test < "${REF_DIR}/import_merge_with_comments.data"
+	assertTrue $?
+	${UCI} -k commit
+	assertTrue $?
+	assertSameFile "${REF_DIR}/import_merge_with_comments.result2" "${CONFIG_DIR}/import-test"
+}
diff --git a/tests/shunit2/tests.d/010_export b/tests/shunit2/tests.d/010_export
index 584bcc8..faf9833 100644
--- a/tests/shunit2/tests.d/010_export
+++ b/tests/shunit2/tests.d/010_export
@@ -12,3 +12,18 @@ test_export ()
 	assertTrue $?
 	assertSameFile ${REF_DIR}/export.result ${TMP_DIR}/export.result
 }
+
+test_export_keep_comments ()
+{
+	cp ${REF_DIR}/export_keep_comments.data ${CONFIG_DIR}/export
+
+	${UCI_Q} -k export nilpackage
+	assertFalse $?
+
+	${UCI_Q} -k export export 1>/dev/null 2>&1
+	assertTrue $?
+
+	${UCI} -k export > ${TMP_DIR}/export_keep_comments.result
+	assertTrue $?
+	assertSameFile ${REF_DIR}/export_keep_comments.result ${TMP_DIR}/export_keep_comments.result
+}
diff --git a/tests/shunit2/tests.d/030_set b/tests/shunit2/tests.d/030_set
index db3c259..33823dc 100644
--- a/tests/shunit2/tests.d/030_set
+++ b/tests/shunit2/tests.d/030_set
@@ -37,6 +37,28 @@ test_set_existing_option()
 	assertSameFile ${REF_DIR}/set_existing_option.result ${CHANGES_DIR}/set
 }
 
+test_set_keep_comments()
+{
+	cp ${REF_DIR}/set_keep_comments.data ${CONFIG_DIR}/set
+
+	# section with comment lines before
+	${UCI} set set.section=named
+	# section with comment after
+	${UCI} set set.section2=named
+	# section with comment lines before and comment after
+	${UCI} set set.section3=named
+
+	# option with comment lines before
+	${UCI} set set.section.opt=val
+	# option with comment after
+	${UCI} set set.section.opt2=val
+	# option with comment lines before and comment after
+	${UCI} set set.section.opt3=val
+
+	${UCI} -k commit
+	assertSameFile ${REF_DIR}/set_keep_comments.result ${CONFIG_DIR}/set
+}
+
 test_set_existing_option_multiline()
 {
 	cp ${REF_DIR}/set_existing_option.data ${CONFIG_DIR}/set
diff --git a/tests/shunit2/tests.d/080_list b/tests/shunit2/tests.d/080_list
index e0a910a..ed8b2b9 100644
--- a/tests/shunit2/tests.d/080_list
+++ b/tests/shunit2/tests.d/080_list
@@ -34,6 +34,16 @@ test_add_list_changes() {
 	assertEquals "$value_list_changes" "$value_list_changes_ref"
 }
 
+test_add_list_keep_comments() {
+	cp ${REF_DIR}/add_list_keep_comments.data ${CONFIG_DIR}/test
+	${UCI} add_list 'test.section.listopt=val'
+	${UCI} add_list 'test.section.listopt=val2'
+	${UCI} -k commit
+	assertSameFile ${REF_DIR}/add_list_keep_comments.result ${CONFIG_DIR}/test
+
+	# add_list can't change a list entry, it adds list entries only.
+}
+
 test_del_list() {
 	prepare_list_test
 	${UCI} commit
@@ -50,3 +60,18 @@ test_del_list_multiline() {
 	${UCI} commit
 	assertSameFile "${REF_DIR}/del_list_multiline_config.result" "$CONFIG_DIR/list_test_config"
 }
+
+test_del_list_keep_comments() {
+	# list entries with comments
+	cp ${REF_DIR}/del_list_keep_comments.data ${CONFIG_DIR}/test
+	# test that the listopts and their comments are gone with del_list of all entries individually
+	${UCI} del_list test.section.listopt=val
+	${UCI} del_list test.section.listopt=val2
+	${UCI} del_list test.section.listopt=val3
+	${UCI} del_list test.section.listopt=val4
+	${UCI} del_list test.section.listopt=val5
+	${UCI} del_list test.section.listopt=val6
+	${UCI} -k commit
+	assertSameFile ${REF_DIR}/del_list_keep_comments.result ${CONFIG_DIR}/test
+}
+
diff --git a/tests/shunit2/tests.d/110_delete b/tests/shunit2/tests.d/110_delete
new file mode 100644
index 0000000..4a2e725
--- /dev/null
+++ b/tests/shunit2/tests.d/110_delete
@@ -0,0 +1,34 @@
+test_delete_section()
+{
+	cp "${REF_DIR}/delete_section.data" "${CONFIG_DIR}/test"
+	${UCI} del test.section2
+	${UCI} commit
+	assertSameFile "${REF_DIR}/delete_section.result" "${CONFIG_DIR}/test"
+}
+
+test_delete_option()
+{
+	cp "${REF_DIR}/delete_option.data" "${CONFIG_DIR}/test"
+	${UCI} del test.section1.opt
+	${UCI} del test.section1.listopt
+	${UCI} commit
+	assertSameFile "${REF_DIR}/delete_option.result" "${CONFIG_DIR}/test"
+}
+
+test_delete_section_keep_comments()
+{
+	cp "${REF_DIR}/delete_section_keep_comments.data" "${CONFIG_DIR}/test"
+	${UCI} del test.section2
+	${UCI} -k commit
+	assertSameFile "${REF_DIR}/delete_section_keep_comments.result" "${CONFIG_DIR}/test"
+}
+
+test_delete_option_keep_comments()
+{
+	cp "${REF_DIR}/delete_option_keep_comments.data" "${CONFIG_DIR}/test"
+	${UCI} del test.section1.opt
+	${UCI} del test.section1.listopt
+	${UCI} -k commit
+	assertSameFile "${REF_DIR}/delete_option_keep_comments.result" "${CONFIG_DIR}/test"
+}
+
diff --git a/tests/shunit2/tests.sh b/tests/shunit2/tests.sh
index 00f56c5..d6629ef 100755
--- a/tests/shunit2/tests.sh
+++ b/tests/shunit2/tests.sh
@@ -41,6 +41,7 @@ assertSameFile() {
 		echo "TEST:"
 		cat $test
 		echo "----"
+		diff -r $ref $test
 	}
 }
 assertNotSegFault()
@@ -76,5 +77,8 @@ TMP_DIR="${TMP_DIR}" \
 UCI="${UCI}" \
 UCI_Q="${UCI_Q}" \
 /bin/sh ${FULL_SUITE}
+EXITSTATUS=$?
 
 rm -rf ${TESTS_DIR}
+
+exit ${EXITSTATUS}
diff --git a/uci.h b/uci.h
index b3ffdf9..531e9b3 100644
--- a/uci.h
+++ b/uci.h
@@ -380,13 +380,24 @@ enum uci_flags {
 	UCI_FLAG_STRICT =        (1 << 0), /* strict mode for the parser */
 	UCI_FLAG_PERROR =        (1 << 1), /* print parser error messages */
 	UCI_FLAG_EXPORT_NAME =   (1 << 2), /* when exporting, name unnamed sections */
-	UCI_FLAG_SAVED_DELTA = (1 << 3), /* store the saved delta in memory as well */
+	UCI_FLAG_SAVED_DELTA =   (1 << 3), /* store the saved delta in memory as well */
+	UCI_FLAG_COMMENTS =      (1 << 4), /* parse, preserve and change comments. */
 };
 
 struct uci_element
 {
 	struct uci_list list;
 	enum uci_type type;
+	/*
+	 * comment format: [<comment_before>][<comment_after>]
+	 * <comment_before>: comment lines placed before the element line,
+	 *    concatenated, each starting with '#' and ending with '\n'.
+	 * <comment_after>: comment at the end of the element line itself,
+	 *    starting with '#' and ending without '\n'.
+	 * Example: "#commentlinebefore1\n#commentlinebefore2\n#commentafter"
+	 * NULL and empty string mean no comment.
+	 */
+	char *comment;
 	char *name;
 };
 
@@ -507,6 +518,16 @@ struct uci_ptr
 	struct uci_option *o;
 	struct uci_element *last;
 
+	/*
+	 * comment format: [<comment_before>][<comment_after>]
+	 * <comment_before>: comment lines placed before the element line,
+	 *    concatenated, each starting with '#' and ending with '\n'.
+	 * <comment_after>: comment at the end of the element line itself,
+	 *    starting with '#' and ending without '\n'.
+	 * Example: "#commentlinebefore1\n#commentlinebefore2\n#commentafter"
+	 * NULL and empty string mean no comment.
+	 */
+	const char *comment;
 	const char *package;
 	const char *section;
 	const char *option;
diff --git a/uci_internal.h b/uci_internal.h
index ff4ee8c..2435035 100644
--- a/uci_internal.h
+++ b/uci_internal.h
@@ -27,6 +27,18 @@ struct uci_parse_context
 
 	/* private: */
 	struct uci_package *package;
+	/*
+	 * comment format: [<comment_before>][<comment_after>]
+	 * <comment_before>: comment lines placed before the element line,
+	 *    concatenated, each starting with '#' and ending with '\n'.
+	 * <comment_after>: comment at the end of the element line itself,
+	 *    starting with '#' and ending without '\n'.
+	 * Example: "#commentlinebefore1\n#commentlinebefore2\n#commentafter"
+	 * NULL and empty string mean no comment.
+	 */
+	char *commentbuf;
+	size_t commentbufsz;
+	size_t commentlen;
 	struct uci_section *section;
 	bool merge;
 	FILE *file;
@@ -42,19 +54,22 @@ struct uci_parse_context
 #define pctx_char(pctx, i)	((pctx)->buf[(i)])
 #define pctx_cur_char(pctx)	pctx_char(pctx, pctx_pos(pctx))
 
-#define uci_alloc_element(ctx, type, name, datasize) \
-	uci_to_ ## type (uci_alloc_generic(ctx, uci_type_ ## type, name, sizeof(struct uci_ ## type) + datasize))
+#define uci_alloc_element(ctx, comment, type, name, datasize) \
+	uci_to_ ## type (uci_alloc_generic(ctx, comment, uci_type_ ## type, name, sizeof(struct uci_ ## type) + datasize))
 
 extern const char *uci_confdir;
 extern const char *uci_savedir;
 
+__private void uci_unescape_comment(char *comment, bool skip_hash);
+__private int uci_add_section_with_comment(struct uci_context *ctx, struct uci_package *p, const char *comment, const char *type, struct uci_section **res);
+
 __private void *uci_malloc(struct uci_context *ctx, size_t size);
 __private void *uci_realloc(struct uci_context *ctx, void *ptr, size_t size);
 __private char *uci_strdup(struct uci_context *ctx, const char *str);
 __private bool uci_validate_str(const char *str, bool name, bool package);
-__private void uci_add_delta(struct uci_context *ctx, struct uci_list *list, int cmd, const char *section, const char *option, const char *value);
+__private void uci_add_delta(struct uci_context *ctx, struct uci_list *list, int cmd, const char *section, const char *option, const char *value, const char *comment);
 __private void uci_free_delta(struct uci_delta *h);
-__private struct uci_package *uci_alloc_package(struct uci_context *ctx, const char *name);
+__private struct uci_package *uci_alloc_package(struct uci_context *ctx, const char *comment, const char *name);
 
 __private FILE *uci_open_stream(struct uci_context *ctx, const char *filename, const char *origfilename, int pos, bool write, bool create);
 __private void uci_close_stream(FILE *stream);
@@ -66,7 +81,7 @@ __private void uci_alloc_parse_context(struct uci_context *ctx);
 __private void uci_cleanup(struct uci_context *ctx);
 __private struct uci_element *uci_lookup_list(struct uci_list *list, const char *name);
 __private void uci_free_package(struct uci_package **package);
-__private struct uci_element *uci_alloc_generic(struct uci_context *ctx, int type, const char *name, int size);
+__private struct uci_element *uci_alloc_generic(struct uci_context *ctx, const char *comment, int type, const char *name, int size);
 __private void uci_free_element(struct uci_element *e);
 __private struct uci_element *uci_expand_ptr(struct uci_context *ctx, struct uci_ptr *ptr, bool complete);
 
@@ -87,6 +102,8 @@ static inline bool uci_validate_name(const char *str)
 	return uci_validate_str(str, true, false);
 }
 
+__private bool uci_validate_comment(const char *comment);
+
 /* initialize a list head/item */
 static inline void uci_list_init(struct uci_list *ptr)
 {
diff --git a/util.c b/util.c
index 61e42cd..fd461e6 100644
--- a/util.c
+++ b/util.c
@@ -101,15 +101,59 @@ bool uci_validate_text(const char *str)
 	return true;
 }
 
+__private bool uci_validate_comment(const char *comment)
+{
+	const char *readptr = comment;
+
+	do {
+		if (*readptr != '#')
+			return false;
+		readptr = strchr(readptr, '\n');
+		if (readptr)
+			readptr++;
+	} while (readptr && *readptr);
+
+	return true;
+}
+
 __private void uci_alloc_parse_context(struct uci_context *ctx)
 {
 	ctx->pctx = (struct uci_parse_context *) uci_malloc(ctx, sizeof(struct uci_parse_context));
 }
 
+__private void uci_unescape_comment(char *comment, bool skip_hash)
+{
+	char *readptr = comment;
+	char *writeptr = comment;
+
+	if (skip_hash && *readptr == '#')
+		readptr++;
+
+	while (*readptr) {
+		if (*readptr != '\\')
+			*writeptr = *readptr;
+		else {
+			if (readptr[1] == '\\') {
+				*writeptr = '\\';
+				readptr++;
+			}
+			else if (readptr[1] == 'n') {
+				*writeptr = '\n';
+				readptr++;
+			}
+			else
+				*writeptr = '\\';
+		}
+		readptr++;
+		writeptr++;
+	}
+	*writeptr = '\0';
+}
+
 int uci_parse_ptr(struct uci_context *ctx, struct uci_ptr *ptr, char *str)
 {
-	char *last = NULL;
 	char *tmp;
+	char *sect_or_opt;
 
 	UCI_HANDLE_ERR(ctx);
 	UCI_ASSERT(ctx, str);
@@ -118,36 +162,52 @@ int uci_parse_ptr(struct uci_context *ctx, struct uci_ptr *ptr, char *str)
 	memset(ptr, 0, sizeof(struct uci_ptr));
 
 	/* value */
-	last = strchr(str, '=');
-	if (last) {
-		*last = 0;
-		last++;
-		ptr->value = last;
+	tmp = strchr(str, '=');
+	if (tmp) {
+		*tmp++ = '\0';
+		ptr->value = tmp;
+
+		if (ctx->flags & UCI_FLAG_COMMENTS) {
+			/* check for a comment */
+			tmp = strchr(tmp, '#');
+			if (tmp) {
+				*tmp++ = 0;
+				ptr->comment = tmp;
+			}
+		}
 	}
 
-	ptr->package = strsep(&str, ".");
-	if (!ptr->package)
-		goto error;
+	tmp = str;
+	sect_or_opt = NULL;
+	ptr->package = tmp;
+	ptr->target = UCI_TYPE_PACKAGE;
+	tmp = strchr(tmp, '.');
+	if (tmp) {
+		*tmp++ = '\0';
+		sect_or_opt = tmp;
+		ptr->section = tmp;
+		ptr->target = UCI_TYPE_SECTION;
 
-	ptr->section = strsep(&str, ".");
-	if (!ptr->section) {
-		ptr->target = UCI_TYPE_PACKAGE;
-		goto lastval;
+		tmp = strchr(tmp, '.');
+		if (tmp) {
+			*tmp++ = '\0';
+			sect_or_opt = tmp;
+			ptr->option = tmp;
+			ptr->target = UCI_TYPE_OPTION;
+		}
 	}
 
-	ptr->option = strsep(&str, ".");
-	if (!ptr->option) {
-		ptr->target = UCI_TYPE_SECTION;
-		goto lastval;
-	} else {
-		ptr->target = UCI_TYPE_OPTION;
+	if (ctx->flags & UCI_FLAG_COMMENTS) {
+		/* If a section or an option without a value, check for a comment. */
+		if (sect_or_opt && !ptr->value) {
+			tmp = strchr(sect_or_opt, '#');
+			if (tmp) {
+				*tmp++ = '\0';
+				ptr->comment = tmp;
+			}
+		}
 	}
 
-	tmp = strsep(&str, ".");
-	if (tmp)
-		goto error;
-
-lastval:
 	if (ptr->package && !uci_validate_package(ptr->package))
 		goto error;
 	if (ptr->section && !uci_validate_name(ptr->section))
@@ -156,6 +216,8 @@ int uci_parse_ptr(struct uci_context *ctx, struct uci_ptr *ptr, char *str)
 		goto error;
 	if (ptr->value && !uci_validate_text(ptr->value))
 		goto error;
+	if (ptr->comment && !uci_validate_comment(ptr->comment))
+		goto error;
 
 	return 0;