diff --git a/ChangeLog b/ChangeLog
index bc43994..eafab2a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,9 +4,11 @@
 		"chown",
 		"copy_dirlinks",
 		"existing",
+		"groupmap",
 		"omit_dir_times",
 		"omit_dir_times"
 		"omit_link_times",
+		"usermap",
 	enhancement: settings{ } now checks for unknown entries and errors if so.
 	change: Lsyncd now writes a startup log message before daemonizing
 		does in case logging fails, it is recognized before it cannot
diff --git a/default-rsync.lua b/default-rsync.lua
index 9f65c1f..c833443 100644
--- a/default-rsync.lua
+++ b/default-rsync.lua
@@ -67,6 +67,7 @@ rsync.checkgauge = {
 		executability     =  true,
 		existing          =  true,
 		group             =  true,
+		groupmap          =  true,
 		hard_links        =  true,
 		ignore_times      =  true,
 		inplace           =  true,
@@ -90,6 +91,7 @@ rsync.checkgauge = {
 		timeout           =  true,
 		times             =  true,
 		update            =  true,
+		usermap           =  true,
 		verbose           =  true,
 		whole_file        =  true,
 		xattrs            =  true,
@@ -409,9 +411,10 @@ rsync.prepare =
 		end
 	end
 
-
 	crsync._computed = { true }
+
 	local computed = crsync._computed
+
 	local computedN = 2
 
 	local shortFlags = {
@@ -503,6 +506,12 @@ rsync.prepare =
 		computedN = computedN  + 1
 	end
 	
+	if crsync.groupmap
+	then
+		computed[ computedN ] = '--groupmap=' .. crsync.groupmap
+		computedN = computedN  + 1
+	end
+	
 	if crsync.existing
 	then
 		computed[ computedN ] = '--existing'
@@ -544,6 +553,12 @@ rsync.prepare =
 		computed[ computedN ] = '--timeout=' .. crsync.timeout
 		computedN = computedN  + 1
 	end
+	
+	if crsync.usermap
+	then
+		computed[ computedN ] = '--usermap=' .. crsync.usermap
+		computedN = computedN  + 1
+	end
 
 	if shortsN ~= 2
 	then