diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 26e3ee3c1ef9c087eb45bbbb564f8bb907ba1bab..32642d01f323086ea03ac93418f8b626251ceafe 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,7 +1,26 @@
 
-Drupal 7.8-dev, xxxx-xx-xx (development version)
+Drupal 7.8, 2011-08-31
 ----------------------
-
+- Fixed critical upgrade path issue with multilingual sites, leading to lost
+  content.
+- Numerous fixes to upgrade path, preventing fatal errors due to incorrect
+  dependencies.
+- Fixed issue with saving files on hosts with open_basedir restrictions.
+- Fixed Update manger error when used with Overlay.
+- Fixed RTL support in Seven administration theme and Overlay.
+- Fixes to nested transaction support.
+- Introduced performance pattern to reduce Drupal core's RAM usage.
+- Added support for HTML 5 tags to filter_xss_admin().
+- Added exception handling to cron.
+- Added new hook hook_field_widget_form_alter() for contribtued modules.
+- element_validate_*() functions now available to contrib.
+- Added new maintainers for several subsystems.
+- Numerous testing system improvements.
+- Numerous markup and CSS fixes.
+- Numerous poll module fixes.
+- Numerous notice/warning fixes.
+- Numerous documentation fixes.
+- Numerous token fixes.
 
 Drupal 7.7, 2011-07-27
 ----------------------
diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc
index 43cbb1d854131962f54f9f1c45ff8add14abf73d..27630d6f36b2d128993574d9843ae94a045d2530 100644
--- a/includes/bootstrap.inc
+++ b/includes/bootstrap.inc
@@ -8,7 +8,7 @@
 /**
  * The current system version.
  */
-define('VERSION', '7.8-dev');
+define('VERSION', '7.8');
 
 /**
  * Core API compatibility.