diff --git a/CHANGELOG.md b/CHANGELOG.md
index 539e5ec..4a1f9cc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,14 @@
 
 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/).
+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.0.1 - 2015-11-05
+
+### Changed
+
+- The variable type of `samba_create_varwww_symlinks` is now boolean instead of string (GH-1)
+- The variable `samba_netbios_name` is no longer required and defaults to `ansible_hostname`.
 
 ## 2.0.0 - 2015-11-05
 
@@ -10,8 +17,8 @@ Bugfix release with changes that are not backwards compatible
 
 ### Changed
 
-- Fixed GH-1: The variable type of `samba_load_*` is now boolean instead of string, which makes more sense. However, this change is **not backwards compatible**.
-- Fixed GH-2: Restart WinBind when changing the configuration
+- The variable type of `samba_load_*` is now boolean instead of string, which makes more sense. However, this change is **not backwards compatible**. (GH-1)
+- Restart WinBind when changing the configuration (GH-2)
 - Updated the base box for the test environment to CentOS 7.1 ([bertvv/centos71](https://atlas.hashicorp.com/bertvv/boxes/centos71/))
 - Cleaned up indentation and spaces in the configuration file template
 
diff --git a/README.md b/README.md
index c32e31b..9c9a65e 100644
--- a/README.md
+++ b/README.md
@@ -19,22 +19,22 @@ Setting the firewall is not a concern of this role, so you should configure this
 
 Variables are not required, unless specified.
 
-| Variable                       | Default         | Comments                                                                          |
-| :---                           | :---            | :---                                                                              |
-| `samba_create_varwww_symlinks` | -               | When this is set to `yes`, symlinks are created in `/var/www/html` to the shares. |
-| `samba_load_homes`             | false           | When true, user home directories are accessible.                                  |
-| `samba_load_printers`          | false           | When true, printers attached to the host are shared                               |
-| `samba_log`                    | -               | Set the log file. If left undefined, logging is done through syslog.              |
-| `samba_log_size`               | 5000            | Set the maximum size of the log file.                                             |
-| `samba_map_to_guest`           | `bad user`      | Behaviour when unregistered users access the shares.                              |
-| `samba_netbios_name`           | -               | **Required.** The NetBIOS name of this server.                                    |
-| `samba_passdb_backend`         | `tdbsam`        | Password database backend.                                                        |
-| `samba_security`               | `user`          | Samba security setting                                                            |
-| `samba_server_string`          | `fileserver %m` | Comment string for the server.                                                    |
-| `samba_shares`                 | -               | List of dicts containing share definitions. See below for details.                |
-| `samba_shares_root`            | `/srv/shares`   | Directories for the shares are created under this directory.                      |
-| `samba_users`                  | -               | List of dicts defining users that can access shares.                              |
-| `samba_workgroup`              | `WORKGROUP`     | Name of the server workgroup.                                                     |
+| Variable                       | Default                  | Comments                                                             |
+| :---                           | :---                     | :---                                                                 |
+| `samba_create_varwww_symlinks` | false                    | When true, symlinks are created in `/var/www/html` to the shares.    |
+| `samba_load_homes`             | false                    | When true, user home directories are accessible.                     |
+| `samba_load_printers`          | false                    | When true, printers attached to the host are shared                  |
+| `samba_log`                    | -                        | Set the log file. If left undefined, logging is done through syslog. |
+| `samba_log_size`               | 5000                     | Set the maximum size of the log file.                                |
+| `samba_map_to_guest`           | `bad user`               | Behaviour when unregistered users access the shares.                 |
+| `samba_netbios_name`           | `{{ ansible_hostname }}` | The NetBIOS name of this server.                                     |
+| `samba_passdb_backend`         | `tdbsam`                 | Password database backend.                                           |
+| `samba_security`               | `user`                   | Samba security setting                                               |
+| `samba_server_string`          | `fileserver %m`          | Comment string for the server.                                       |
+| `samba_shares`                 | -                        | List of dicts containing share definitions. See below for details.   |
+| `samba_shares_root`            | `/srv/shares`            | Directories for the shares are created under this directory.         |
+| `samba_users`                  | -                        | List of dicts defining users that can access shares.                 |
+| `samba_workgroup`              | `WORKGROUP`              | Name of the server workgroup.                                        |
 
 ### Defining users
 
@@ -64,6 +64,8 @@ el7_users:
       [...]
 ```
 
+This user is not allowed to log in on the system (e.g. with SSH) and would only get access to the Samba shares.
+
 ### Defining shares
 
 Defining Samba shares and configuring access control can be challenging, since it involves not only getting the Samba configuration right, but also user and file permissions, and SELinux settings. This role attempts to simplify the process.
diff --git a/meta/main.yml b/meta/main.yml
index 95ac6ec..d8171e2 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -13,4 +13,4 @@ galaxy_info:
     - system
     - networking
 dependencies: []
-version: 2.0.0
+version: 2.0.1