diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index e98c8d6..8b76c72 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,5 +1,36 @@
-rbackup Changelog
-=================
+Changelog for rbackup
+=====================
+
+Version 0.6
+-----------
+
+* backup script
+
+  * Add --port option for ssh
+  * Add --umask option for changing umask of backup process
+
+* backupd
+
+  * Add backupd script
+  * Add config file
+
+* rbackup.network
+
+  * Add rbackup.network module
+
+* rbackup.system
+
+  * Add associated tests
+
+* Building
+
+  * Fix incorrect parameters on setup.py sphinx section
+
+* Project Structure
+
+  * Add ``rbackup.network``, ``rbackup.system``, and ``rbackup.system``
+  * Split main backup script into separate library modules for easier maintainability
+  
 
 Version 0.5.3
 -------------
diff --git a/setup.py b/setup.py
index 451c128..a4ffd72 100644
--- a/setup.py
+++ b/setup.py
@@ -15,7 +15,7 @@ with open("README.rst", "r") as fh:
 # ========== Package Setup ==========
 setuptools.setup(
     name="rbackup",
-    version="0.5.3",
+    version="0.6",
     cmdclass=CMDCLASS,
     author="Eric Torres",
     author_email="erictorres4@protonmail.com",