diff --git a/doc/changelog b/doc/changelog
index fdd9c16d..3679ae0f 100644
--- a/doc/changelog
+++ b/doc/changelog
@@ -1,3 +1,9 @@
+Changelog
+---------
+
+	* Changes are always commented with their author in (braces)
+	* Exception: No braces means author == Nico Schottelius
+
 2.0.6:
 	* Bugfix __apt_ppa:
 		Also remove the [ppa-name].list file, if empty. (Tim Kersten)
@@ -9,7 +15,6 @@
 	* New Type: __rvm_gem (Evax Software)
 	* New Type: __rvm_gemset (Evax Software)
 	* New Type: __rvm_ruby (Evax Software)
-	* New Type: __rsyncer (Daniel Maher)
 	* Feature core: Added new dependency resolver (Steven Armstrong)
 
 2.0.5: 2012-01-18
diff --git a/other/types_submitted_for_inclusion/__rsyncer/README.inclusion b/other/types_submitted_for_inclusion/__rsyncer/README.inclusion
new file mode 100644
index 00000000..eff48995
--- /dev/null
+++ b/other/types_submitted_for_inclusion/__rsyncer/README.inclusion
@@ -0,0 +1,22 @@
+Description:
+
+    Type that supports transfer of huge data, which is a general problem in
+    configuration management systems.
+
+    Good solution using standardised rsync approach.
+
+Problem:
+
+    Uses root@$__target_host:$destination notation for transfer.
+    This breaks the concept of being able to replace __remote_exec and
+    __remote_copy and then doing chroot or different stuff.
+
+    This breaks for instance, if __remote_copy = cp and the destination is
+    a local chroot.
+
+Solutions:
+
+    - Have cdist provide support for rsync syntax?
+    - Integrate __rsyncer more in line with philosohpy of other components
+    - Think about the general way of __rsyncer and what cdist would need
+      to provide for general solution.
diff --git a/conf/type/__rsyncer/gencode-local b/other/types_submitted_for_inclusion/__rsyncer/gencode-local
similarity index 100%
rename from conf/type/__rsyncer/gencode-local
rename to other/types_submitted_for_inclusion/__rsyncer/gencode-local
diff --git a/conf/type/__rsyncer/man.text b/other/types_submitted_for_inclusion/__rsyncer/man.text
similarity index 100%
rename from conf/type/__rsyncer/man.text
rename to other/types_submitted_for_inclusion/__rsyncer/man.text
diff --git a/conf/type/__rsyncer/parameter/optional b/other/types_submitted_for_inclusion/__rsyncer/parameter/optional
similarity index 100%
rename from conf/type/__rsyncer/parameter/optional
rename to other/types_submitted_for_inclusion/__rsyncer/parameter/optional
diff --git a/conf/type/__rsyncer/parameter/required b/other/types_submitted_for_inclusion/__rsyncer/parameter/required
similarity index 100%
rename from conf/type/__rsyncer/parameter/required
rename to other/types_submitted_for_inclusion/__rsyncer/parameter/required