diff --git a/.gitignore b/.gitignore
index 5917be1..0254e48 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 translate-toolkit-1.7.0.tar.bz2
+translate-toolkit-1.8.0.tar.bz2
diff --git a/sources b/sources
index c89583d..a33f746 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-70a826257adbffab849556c2d50b8b48  translate-toolkit-1.7.0.tar.bz2
+6acc870d677d6312625e3e002d483b58  translate-toolkit-1.8.0.tar.bz2
diff --git a/translate-toolkit-1.7.0-bug603597_r14946_moz2po_needs_output_dir.patch b/translate-toolkit-1.7.0-bug603597_r14946_moz2po_needs_output_dir.patch
deleted file mode 100644
index b606072..0000000
--- a/translate-toolkit-1.7.0-bug603597_r14946_moz2po_needs_output_dir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/trunk/translate/misc/optrecurse.py	2010/07/14 13:25:45	14945
-+++ src/trunk/translate/misc/optrecurse.py	2010/07/14 20:12:34	14946
-@@ -454,6 +454,8 @@
-         """recurse through directories and process files"""
-         if self.isrecursive(options.input, 'input') and getattr(options, "allowrecursiveinput", True):
-             if not self.isrecursive(options.output, 'output'):
-+                if not options.output:
-+                    self.error(optparse.OptionValueError("No output directory given"))
-                 try:
-                     self.warning("Output directory does not exist. Attempting to create")
-                     os.mkdir(options.output)
diff --git a/translate-toolkit-1.7.0-lang_zh_lamba.patch b/translate-toolkit-1.7.0-lang_zh_lamba.patch
deleted file mode 100644
index 1814b55..0000000
--- a/translate-toolkit-1.7.0-lang_zh_lamba.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/trunk/translate/lang/zh.py	2010/05/17 13:23:56	14599
-+++ src/trunk/translate/lang/zh.py	2010/05/18 16:04:23	14600
-@@ -63,6 +63,8 @@
-         u"% ": u"%",
-     }
- 
--    length_difference = lambda cls, x: 10 - x / 2
-+    def length_difference(cls, length):
-+        return 10 - length / 2
-+    length_difference = classmethod(length_difference)
- 
-     ignoretests = ["startcaps", "simplecaps"]
diff --git a/translate-toolkit.spec b/translate-toolkit.spec
index 2f9ea94..3c8e882 100644
--- a/translate-toolkit.spec
+++ b/translate-toolkit.spec
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           translate-toolkit
-Version:        1.7.0
-Release:        4%{?dist}
+Version:        1.8.0
+Release:        1%{?dist}
 Summary:        Tools to assist with translation and software localization
 
 Group:          Development/Tools
@@ -13,8 +13,6 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch0:         translate-toolkit-1.5.3-stoplist.patch
 Patch1:         translate-toolkit-1.5.0-langmodel_dir.patch
-Patch2:         translate-toolkit-1.7.0-lang_zh_lamba.patch
-Patch3:         translate-toolkit-1.7.0-bug603597_r14946_moz2po_needs_output_dir.patch
 
 BuildArch:      noarch
 BuildRequires:  python2-devel
@@ -71,8 +69,6 @@ toolkit or to use the libraries in other localization tools.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p2
-%patch3 -p2
 
 
 %build
@@ -88,7 +84,7 @@ mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1
 for program in $RPM_BUILD_ROOT/%{_bindir}/*; do
     case $(basename $program) in
       pocompendium|poen|pomigrate2|popuretext|poreencode|posplit|\
-      pocount|poglossary|lookupclient.py|tmserver|build_tmdb|\
+      pocount|poglossary|tmserver|build_tmdb|\
       junitmsgfmt)
        ;;
       *)
@@ -131,6 +127,15 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 18 2010 Dwayne Bailey <dwayne@translate.org.za> - 1.8.0-1
+- Update to 1.8.0
+   - Required for Pootle 2.1 and recommended for Pootle 2.0
+   - File formats: Adobe Flex, Mac OS X strings, Haiku catkeys
+   - Terminology: Improvements to poterminology and terminology suggestions
+   - Other improvements: Improvements to indexing performance and reliability
+     in Pootle
+- Drop patches: zh lambda, moz2po output directory
+
 * Thu Jul 22 2010 David Malcolm <dmalcolm@redhat.com> - 1.7.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild