diff --git a/openbox.spec b/openbox.spec
index 604e4f9..96226a3 100644
--- a/openbox.spec
+++ b/openbox.spec
@@ -1,18 +1,12 @@
-%define		ob_version			3.3
-%define		ob_pre_tag			rc2
-%define		pkg_release			8
-%define		ob_tarball_version	%{ob_version}%{?ob_pre_tag:-%{ob_pre_tag}}		
-%define		branch_release		1
-
 Name:		openbox
-Version:	%{ob_version}
-Release:	%{?ob_pre_tag:0.}%{pkg_release}%{?ob_pre_tag:.%{ob_pre_tag}}%{?dist}%{?branch_release:.%{branch_release}}
+Version:	3.3
+Release:	1%{?dist}
 Summary:	A highly configurable and standards-compliant X11 window manager
 
 Group:		User Interface/Desktops
 License:	GPL
 URL:		http://icculus.org/openbox
-Source0:	http://icculus.org/openbox/releases/%{name}-%{ob_tarball_version}.tar.gz
+Source0:	http://icculus.org/openbox/releases/%{name}-%{version}.tar.gz
 Source1:	openbox.desktop
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -21,7 +15,9 @@ Requires:	%{_datadir}/themes
 
 BuildRequires:	gettext
 BuildRequires:	pango-devel
-BuildRequires:	startup-notification-devel
+# According to the upstream version 3.3 changelog, libstartup-notification
+# support doesn't work well and so is disabled by default in this release. 
+# BuildRequires:	startup-notification-devel
 BuildRequires:	libxml2-devel
 BuildRequires:	libXt-devel
 BuildRequires:	libXrandr-devel
@@ -56,7 +52,7 @@ developing applications that use %{name}.
 
 
 %prep
-%setup -q -n "%{name}-%{ob_tarball_version}"
+%setup -q
 
 
 %build
@@ -108,6 +104,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Aug 26 2006 Peter Gordon <peter@thecodergeek.com> - 3.3-1
+- Update to 3.3 final release from upstream
+- Remove the slew of versioning macros, as it's overkill for this and just adds
+  unneeded complexity to the spec.
+
 * Wed Jun 28 2006 Peter Gordon <peter@thecodergeek.com> - 3.3-0.8.rc2.1
 - Add missing BuildRequires: libXxf86vm-devel