diff --git a/.cvsignore b/.cvsignore
index 8bb66bc..4584050 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-workrave-1.8.4-2.tar.gz
+workrave-1.8.5.tar.gz
diff --git a/sources b/sources
index 99c5a33..8b97945 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ddb2d1d86b4adbe00fe662f0015bc6b4  workrave-1.8.4-2.tar.gz
+3df48ab5600256fadc11a976f15bcc7a  workrave-1.8.5.tar.gz
diff --git a/workrave-1.8.4-applet-crash.patch b/workrave-1.8.4-applet-crash.patch
deleted file mode 100644
index e650248..0000000
--- a/workrave-1.8.4-applet-crash.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- workrave/trunk/frontend/gtkmm/src/GUI.cc	2007/03/04 18:23:55	1144
-+++ workrave/trunk/frontend/gtkmm/src/GUI.cc	2007/03/27 18:12:49	1161
-@@ -223,8 +223,8 @@
-   init_core();
-   init_sound_player();
-   init_multihead();
--  init_remote_control();
-   init_gui();
-+  init_remote_control();
- 
-   on_timer();
diff --git a/workrave-1.8.4-applet-fix.patch b/workrave-1.8.4-applet-fix.patch
deleted file mode 100644
index fe5c0ff..0000000
--- a/workrave-1.8.4-applet-fix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- workrave/trunk/frontend/gtkmm/src/GnomeAppletWindow.cc	2007/04/29 20:40:04	1175
-+++ workrave/trunk/frontend/gtkmm/src/GnomeAppletWindow.cc	2007/04/29 22:06:30	1176
-@@ -177,6 +177,11 @@
-   
-       CORBA_exception_free(&ev);
-     }
-+
-+  if (ok)
-+    {
-+      applet_active = true;
-+    }
-   
-   TRACE_EXIT();
-   return ok ?
diff --git a/workrave.spec b/workrave.spec
index e922705..6a02bf5 100644
--- a/workrave.spec
+++ b/workrave.spec
@@ -1,16 +1,14 @@
 Name: workrave
-Version: 1.8.4
-Release: 4%{?dist}
+Version: 1.8.5
+Release: 1%{?dist}
 Summary: Program that assists in the recovery and prevention of RSI
 # Based on older packages by Dag Wieers <dag@wieers.com> and Steve Ratcliffe
 License: GPLv2+
 Group: Applications/Productivity
 URL: http://workrave.sourceforge.net/
 # For some reason the upstream tarball contains the -2 added to the version.
-Source0: http://prdownloads.sourceforge.net/workrave/%{name}-%{version}-2.tar.gz
+Source0: http://prdownloads.sourceforge.net/workrave/%{name}-%{version}.tar.gz
 Source1: workrave.desktop
-Patch1: workrave-1.8.4-applet-crash.patch
-Patch2: workrave-1.8.4-applet-fix.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gettext
@@ -28,8 +26,6 @@ take micro-pauses, rest breaks and restricts you to your daily limit.
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch1 -p2 -b .crash
-%patch2 -p2 -b .appletfix
 
 %build
 if [ ! -x configure ]; then
@@ -56,7 +52,7 @@ desktop-file-install --vendor fedora                    \
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc AUTHORS ChangeLog COPYING NEWS README
+%doc AUTHORS COPYING NEWS README
 %{_bindir}/*
 %{_datadir}/workrave/
 %{_datadir}/sounds/workrave
@@ -70,6 +66,9 @@ desktop-file-install --vendor fedora                    \
 %{_datadir}/applications/fedora-workrave.desktop
 
 %changelog
+* Mon Jan  7 2008 Tomas Mraz <tmraz@redhat.com> - 1.8.5-1
+- upgrade to latest upstream version
+
 * Wed Aug 22 2007 Tomas Mraz <tmraz@redhat.com> - 1.8.4-4
 - applet counters don't start properly
 - license tag fix