diff --git a/CHANGES.md b/CHANGES.md
new file mode 100644
index 0000000000000000000000000000000000000000..c4949c0c4ad585a02f81012a42b8aa8a089683af
--- /dev/null
+++ b/CHANGES.md
@@ -0,0 +1,3 @@
+### version 0.2.2
+
+* move the config file location from /etc/leap/nickserver.yml to /etc/nickserver.yml
\ No newline at end of file
diff --git a/README.md b/README.md
index edeae59498b463041713d43ba649820eb7665c5d..d157af328231a0c0c8721b52b1162743fae3768a 100644
--- a/README.md
+++ b/README.md
@@ -67,12 +67,11 @@ Configuration
 ==================================
 
 Nickserver loads the configuration files `config/default.yml` and
-`/etc/leap/nickserver.yml`, if it exists. See `config/default.yml` for the
+`/etc/nickserver.yml`, if it exists. See `config/default.yml` for the
 available options.
 
 The default HKP host is set to https://hkps.pool.sks-keyservers.net. The CA
-for this pool is available here https://sks-keyservers.net/sks-
-keyservers.netCA.pem
+for this pool is available here https://sks-keyservers.net/sks-keyservers.netCA.pem
 
 Usage
 ==================================
diff --git a/lib/nickserver/config.rb b/lib/nickserver/config.rb
index be401f5aaf6b59801c7c708436922c63b1a5f761..31fbfea83cd3022b135d349f68ae9e2443aa48b1 100644
--- a/lib/nickserver/config.rb
+++ b/lib/nickserver/config.rb
@@ -4,7 +4,7 @@ module Nickserver
   class Config
     PATHS = [
       File.expand_path('../../../config/default.yml', __FILE__),
-      '/etc/leap/nickserver.yml'
+      '/etc/nickserver.yml'
     ]
 
     class << self
diff --git a/lib/nickserver/version.rb b/lib/nickserver/version.rb
index 1910fe10758e9f58564aacedda086df87c132a97..fca33a05fb79e8b4c430637dc51372e7ca776449 100644
--- a/lib/nickserver/version.rb
+++ b/lib/nickserver/version.rb
@@ -1,3 +1,3 @@
 module Nickserver
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end