diff --git a/CHANGELOG.md b/CHANGELOG.md
index 21e0feb75..7a4815f5d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,34 @@
 `psql` with the `-X` flag to prevent any `.psqlrc` commands from
 accidentally triggering the load of a previous DB version.**
 
+## 0.9.1 (2018-03-26)
+
+**High-level changes**
+* **For this release only**, you will need to restart the database before
+running `ALTER EXTENSION`
+* Several edge cases regarding CTEs addressed
+* Updated preloader with better error messaging and fixed edge case
+* ABI compatibility with latest PostgreSQL to help catch any breaking
+changes
+
+**Notable commits**
+* [40ce037] Fix crash on explain analyze with insert cte
+* [8378beb] Enable hypertable inserts within CTEs
+* [bdfda75] Fix double-loading of extension
+* [01ea77e] Fix EXPLAIN output for ConstraintAwareAppend inside CTE
+* [fc05637] Add no preload error to versioned library.
+* [38f8e0c] Add ABI compatibility tests
+* [744ca09] Fix Cache Pinning for Subtxns
+* [39010db] Move more drops into event trigger system
+* [fc36699] Do not fail add_dimension() on non-empty table with 'if_not_exists'
+
+**Thanks**
+* @The-Alchemist for pointing out broken links in the README
+* @chaintng for pointing out a broken link in the docs
+* @jgranstrom for reporting a edge case crash with UPSERTs in CTEs
+* @saosebastiao for reporting the lack of an error message when the library is not preloaded and trying to delete/modify a hypertable
+* @jbylund for reporting a cache invalidation issue with the preloader
+
 ## 0.9.0 (2018-03-05)
 
 **High-level changes**
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt
index 9b2b7e115..194768763 100644
--- a/sql/CMakeLists.txt
+++ b/sql/CMakeLists.txt
@@ -51,7 +51,7 @@ set(MOD_FILES
   updates/0.7.0--0.7.1.sql
   updates/0.7.1--0.8.0.sql
   updates/0.8.0--0.9.0.sql
-  updates/0.9.0--0.10.0-dev.sql
+  updates/0.9.0--0.9.1.sql
 )
 
 set(MODULE_PATHNAME "$libdir/timescaledb-${PROJECT_VERSION_MOD}")
@@ -149,7 +149,11 @@ foreach(transition_mod_file ${MOD_FILES_LIST})
 
   set(UPDATE_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/timescaledb--${START_VERSION}--${PROJECT_VERSION_MOD}.sql)
   list(APPEND UPDATE_SCRIPTS ${UPDATE_SCRIPT})
-  cat_files("${PRE_FILES};${CURR_MOD_FILES};${SOURCE_FILES_VERSIONED}" ${UPDATE_SCRIPT})
+  if (CURR_MOD_FILES)
+    cat_files("${PRE_FILES};${CURR_MOD_FILES};${SOURCE_FILES_VERSIONED}" ${UPDATE_SCRIPT})
+  else ()
+    cat_files("${PRE_FILES};${SOURCE_FILES_VERSIONED}" ${UPDATE_SCRIPT})
+  endif ()
 endforeach(transition_mod_file)
 
 add_custom_target(sqlupdatescripts ALL DEPENDS ${UPDATE_SCRIPTS})
diff --git a/sql/updates/0.9.0--0.10.0-dev.sql b/sql/updates/0.9.0--0.10.0-dev.sql
deleted file mode 100644
index e69de29bb..000000000
diff --git a/version.config b/version.config
index 752f626c2..e4eca6110 100644
--- a/version.config
+++ b/version.config
@@ -1,2 +1,2 @@
-version = 0.10.0-dev
+version = 0.9.1
 update_from_version = 0.9.0