diff --git a/DEVELOP.rst b/DEVELOP.rst
index 2d163a4f..80989526 100644
--- a/DEVELOP.rst
+++ b/DEVELOP.rst
@@ -83,4 +83,42 @@ is to launch `psql -E` and entering `\l`.
 That will print the results and also print the sql statement that was executed
 to produce that result. In most cases it's a single sql statement, but sometimes
 it's a series of sql statements that feed the results to each other to get to
-the final result.
\ No newline at end of file
+the final result.
+
+Building RPM and DEB packages
+-----------------------------
+
+You will need Vagrant 1.7.2 or higher. In the project root there is a
+Vagrantfile that is setup to do multi-vm provisioning. If you're setting things
+up for the first time, then do: 
+
+::
+
+    $ version=x.y.z vagrant up debian
+    $ version=x.y.z vagrant up centos
+
+If you already have those VMs setup and you're merely creating a new version of
+DEB or RPM package, then you can do: 
+
+::
+
+    $ version=x.y.z vagrant provision
+
+That will create a .deb file and a .rpm file. 
+
+The deb package can be installed as follows:
+
+::
+
+    $ sudo dpkg -i pgcli*.deb   # if dependencies are available.
+    
+    or 
+
+    $ sudo apt-get install -f pgcli*.deb  # if dependencies are not available.
+
+
+The rpm package can be installed as follows:
+
+::
+
+    $ sudo yum install pgcli*.rpm
diff --git a/changelog.rst b/changelog.rst
index 57f11c5b..e0465b55 100644
--- a/changelog.rst
+++ b/changelog.rst
@@ -5,11 +5,13 @@ Features:
 ---------
 
 * Add support for auto-completing view names. (Thanks: darikg_)
+* Add support for building RPM and DEB packages. (Thanks: dp_)
 
 Bug Fixes:
 ----------
 
 * Fix the table formatting while printing multi-byte characters (Chinese, Japanese etc). (Thanks: `蔡佳男`_)
+* Fix a crash when pg_catalog was present in search path. (Thanks: darikg_)
 
 0.16.3
 ======
@@ -186,3 +188,4 @@ Improvements:
 .. _`Daniel Rocco`: https://github.com/drocco007 
 .. _`Jay Zeng`:  https://github.com/jayzeng 
 .. _`蔡佳男`: https://github.com/xalley
+.. _dp: https://github.com/ceocoder