diff --git a/.gitignore b/.gitignore
index e0dc0ca..95ca736 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,3 +44,4 @@ anaconda-15.2.tar.bz2
 /anaconda-18.2.tar.bz2
 /anaconda-18.3.tar.bz2
 /anaconda-18.4.tar.bz2
+/anaconda-18.5.tar.bz2
diff --git a/anaconda.spec b/anaconda.spec
index 018f244..5c24fa9 100644
--- a/anaconda.spec
+++ b/anaconda.spec
@@ -2,7 +2,7 @@
 
 Summary: Graphical system installer
 Name:    anaconda
-Version: 18.4
+Version: 18.5
 Release: 1%{?dist}
 License: GPLv2+
 Group:   Applications/System
@@ -293,6 +293,74 @@ update-desktop-database &> /dev/null || :
 /usr/lib/dracut/modules.d/80%{name}/*
 
 %changelog
+* Wed Aug 15 2012 Chris Lumens <clumens@redhat.com> - 18.5-1
+- Mark/unmark some strings for translation, as appropriate. (clumens)
+- Save the distro label into the right variable for retranslation. (clumens)
+- Add custom widget files to POTFILES.in. (clumens)
+- Fix attribution on common UI code. (clumens)
+- don't set armMachine in class definition (bcl)
+- libudev now has a version of .1 (hamzy)
+- Load anaconda-lib.sh if necessary (jkeating)
+- Use shell code to work around missing basename (jkeating)
+- Enable text mode once again! (jkeating)
+- Update text prompt to include c for continue (jkeating)
+- Don't continue if incomplete spokes exist (jkeating)
+- Return a bool for timezone completed property (jkeating)
+- Add a text progress hub to do the install (jkeating)
+- text based storage spoke. (jkeating)
+- Allow updating tmux.conf via makeupdates. (clumens)
+- Prevent yum messages from showing on tty (jkeating)
+- Remove unused imports from the installclasses. (clumens)
+- NoSuchGroup is provided by packaging now.  yuminstall is on the way out.
+  (clumens)
+- Set transaction color in case of multilib install. (clumens)
+- Add selinux-specific RPM macro setup. (clumens)
+- Add the user-agent to urlgrabber from the old yuminstall.py. (clumens)
+- Fix inheritance problems with the gui *Spoke classes. (clumens)
+- Only setup python-meh when doing graphical installs (jkeating)
+- Call the correct method to schedule the screen (jkeating)
+- Add a missing import of os (jkeating)
+- Don't display indirect spokes in the hub (jkeating)
+- Revert "Remove unncessary __init__ definition. (clumens)" (jkeating)
+- Honor displayMode from kickstart files (jkeating)
+- Merge master into newtui (jkeating)
+- Remove the base_tests file for now (jkeating)
+- Remove unused import of UIObject (jkeating)
+- Fix up detailederror for new common UI code (jkeating)
+- Translate the base text hub class (jkeating)
+- Translate the base tui class strings (jkeating)
+- Remove unncessary __init__ definition. (clumens) (jkeating)
+- Translate some strings in the base tui spokes classes (jkeating)
+- Always use collect directly from common (jkeating)
+- Add comment headers to the new files (jkeating)
+- Ad source files to POTFILES.in (msivak)
+- Merge remote-tracking branch 'origin/master' into newtui (msivak)
+- import localization stuff and use it to translate more strings (msivak)
+- finish renaming _mainloop (msivak)
+- Fix naming for data attribute and move the NormalSpoke.__init__ under the
+  proper class (msivak)
+- Improve documentation and add licensing headers (msivak)
+- Add translations to the simpleline framework (msivak)
+- Add translations to Password Spoke (msivak)
+- Add elementary timezone spoke (msivak)
+- Pass screen args argument to prompt and input methods + fix for run-text-
+  spoke (msivak)
+- Merge master into newtui (msivak)
+- Add automake files for TUI (msivak)
+- add couple of tests and fix write method of widget (newline added unwanted
+  space) (msivak)
+- add couple of tests and support for them (msivak)
+- add documentation and comments to TUI classes (msivak)
+- Add documentation to the simpleline library for TUI (msivak)
+- Add the new Summary hub and Password TUI spokes + tools to test TUI stuff
+  (msivak)
+- Fix bits and pieces to make TUI hub and spoke model work + example Hub and
+  Password spoke (msivak)
+- Create common abstract classes usable for all types of UI (msivak)
+- Create the base classes for TUI Hub and Spoke model (msivak)
+- Make collect and part of UserInterface setup more generic (msivak)
+- Text based UI framework core (msivak)
+
 * Mon Aug 13 2012 Chris Lumens <clumens@redhat.com> - 18.4-1
 - dracut: fix inst.ks.sendmac (#826657) (wwoods)
 - dracut: suppress ks errors from missing %include (wwoods)
diff --git a/sources b/sources
index f982ef8..12e8e14 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-67d0fbc9ee8319cd883be60ea84b55bf  anaconda-18.4.tar.bz2
+a984e2082e9910757a777c00a4fc2967  anaconda-18.5.tar.bz2