diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5d0082d..20534aa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,15 @@ This file contains al notable changes to the bertvv.samba Ansible role.
 
 This file adheres to the guidelines of [http://keepachangelog.com/](http://keepachangelog.com/). Versioning follows [Semantic Versioning](http://semver.org/). "GH-X" refers to the X'th issue on the Github project.
 
+## 2.1.1 - 2016-05-29
+
+This is a bugfix release.
+
+### Changed
+
+- (GH-6) Made creation of Samba users idempotent. The task "Create Samba users [...]" will now only indicate it has changed when it actually created a user.
+- (GH-9) Fixed forgotten `when: samba_create_varwww_symlinks` (credit: [DarkStar1973](https://github.com/DarkStar1973))
+
 ## 2.1.0 - 2016-05-12
 
 ### Added
diff --git a/README.md b/README.md
index 3599e31..3f80655 100644
--- a/README.md
+++ b/README.md
@@ -52,7 +52,7 @@ samba_users:
     password: eilrahc
 ```
 
-Unfortunately, passwords have to be in plain text for now.
+Unfortunately, passwords have to be in plain text for now. Also, remark that this role will not change the password of an existing user.
 
 These users should already have an account on the host! Creating system users is not a concern of this role, so you should do this separately. A possibility is my role [bertvv.el7](https://galaxy.ansible.com/bertvv/el7/). An example:
 
@@ -155,11 +155,9 @@ Issues, feature requests, ideas are appreciated and can be posted in the Issues
 
 BSD
 
-## Author Information
-
-Bert Van Vreckem (bert.vanvreckem@gmail.com)
-
-Contributions by:
+## Contributors
 
+- [Bert Van Vreckem](https://github.com/bertvv) (maintainer)
 - [Birgit Croux](https://github.com/birgitcroux)
+- [DarkStar1973](https://github.com/DarkStar1973)
 - [Ian Young](https://github.com/iangreenleaf)