diff --git a/conf/type/__file/man.text b/conf/type/__file/man.text
index 04e0ffc3..e1c13db8 100644
--- a/conf/type/__file/man.text
+++ b/conf/type/__file/man.text
@@ -25,9 +25,15 @@ destination::
    If supplied, use this as the destination on the target. Otherwise the
    object_id is used.
 
+group::
+   Group to chgrp to.
+
 mode::
    Unix permissions, suitable for chmod.
 
+owner::
+   User to chown to.
+
 source::
    If supplied, copy this file from the host running cdist to the target.
    If not supplied, an empty file or directory will be created.
@@ -45,6 +51,11 @@ __file cdist-marker --type file --destination /etc/cdist-configured
 
 # Use __file from another type
 __file /etc/issue --source "$__type/files/archlinux" --type file
+
+# Supply some more settings
+__file /etc/shadow --source "$__type/files/shadow" --type file \
+   --owner root --group shadow --mode 0640
+
 --------------------------------------------------------------------------------
 
 
diff --git a/doc/changelog b/doc/changelog
index dc332cf2..e712c15f 100644
--- a/doc/changelog
+++ b/doc/changelog
@@ -3,6 +3,7 @@
 	* New type __addifnosuchline
 	* Document type __issue
 	* Document type __package_pacman
+	* New parameter for __file: --owner and --group
 
 1.0.3: 2011-03-11
 	* Update regexp used for sane characters