diff --git a/.cvsignore b/.cvsignore
index 24901d7..d85a838 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-openbox-3.3.1.tar.gz
+openbox-3.4.2.tar.gz
diff --git a/openbox.desktop b/openbox.desktop
deleted file mode 100644
index 8c4421b..0000000
--- a/openbox.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Openbox
-Comment=Fast and standards-compliant window manager
-Exec=openbox
-Terminal=False
-
-[Window Manager]
-SessionManaged=true
\ No newline at end of file
diff --git a/openbox.spec b/openbox.spec
index 7147b80..625e204 100644
--- a/openbox.spec
+++ b/openbox.spec
@@ -1,18 +1,12 @@
-# According to the upstream version 3.3 changelog, libstartup-notification
-# support doesn't work well and so is disabled by default in this release.
-# Should we forcibly build startup-notification support? [Default: No]
-%bcond_with	startup_notification
-
 Name:		openbox
-Version:	3.3.1
-Release:	7%{?dist}
+Version:	3.4.2
+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}-%{version}.tar.gz
-Source1:	openbox.desktop
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -21,14 +15,12 @@ Requires:	%{name}-libs = %{version}-%{release}
 
 BuildRequires:	gettext
 BuildRequires:	pango-devel
-%if %{with startup_notification}
 BuildRequires:	startup-notification-devel
-%endif
 BuildRequires:	libxml2-devel
+BuildRequires:	libXcursor-devel
 BuildRequires:	libXt-devel
 BuildRequires:	libXrandr-devel
 BuildRequires:	libXinerama-devel
-BuildRequires:	libXxf86vm-devel
 
 %description
 Openbox is a window manager designed explicity for standards-compliance and
@@ -49,7 +41,7 @@ Summary:	Development files for %{name}
 Group:		Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	pkgconfig
-# Needs these two for the various #include directives in its headers
+Requires:	pango-devel
 Requires:	libxml2-devel
 Requires:	glib2-devel
 
@@ -72,7 +64,6 @@ The %{name}-libs package contains shared libraries used by %{name}.
 
 %build
 %configure \
-	%{?with_startup_notification: --enable-startup-notification}	\
 	--disable-static
 ## Fix RPATH hardcoding.
 sed -ie 's|^hardcode_libdir_flag_spec=.*$|hardcode_libdir_flag_spec=""|g' libtool
@@ -84,7 +75,8 @@ make %{?_smp_mflags}
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 %find_lang %{name}
-install -D -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/xsessions/%{name}.desktop 
+rm -f %{buildroot}%{_libdir}/*.la
+rm -rf %{buildroot}%{_datadir}/doc/%{name}
 
 
 %clean
@@ -94,23 +86,22 @@ rm -rf %{buildroot}
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS CHANGELOG COMPLIANCE COPYING README
-%config(noreplace)	/etc/xdg/%{name}/
+%doc data/*.xsd doc/rc-mouse-focus.xml
+%dir %{_sysconfdir}/xdg/%{name}/
+%config(noreplace) %{_sysconfdir}/xdg/%{name}/*
 %{_bindir}/gnome-panel-control
-%{_bindir}/kdetrayproxy
-%{_bindir}/%{name}
+%{_bindir}/%{name}*
 %{_datadir}/themes/*/
 %{_datadir}/pixmaps/%{name}.png
-%{_datadir}/%{name}/
 %{_datadir}/gnome/wm-properties/
-%{_datadir}/xsessions/%{name}.desktop
-%exclude	%{_libdir}/*.la
+%{_datadir}/xsessions/%{name}*.desktop
+%{_mandir}/man1/%{name}*.1*
 
 %files	libs
 %{_libdir}/libobrender.so.*
 %{_libdir}/libobparser.so.*
 
 %files	devel
-%doc COPYING
 %{_includedir}/%{name}/
 %{_libdir}/libobrender.so
 %{_libdir}/libobparser.so
@@ -124,6 +115,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Jun 13 2007 Miroslav Lichvar <mlichvar@redhat.com> - 3.4.2-1
+- Update to 3.4.2
+
 * Mon Jun 04 2007 Peter Gordon <peter@thecodergeek.com> - 3.3.1-7
 - Own %%{_datadir}/gnome/wm-properties instead of depending on gnome-session
   in order to reduce dependency bloat. (Resolves bug 242339; thanks to Miroslav
diff --git a/sources b/sources
index 5295ac1..90a398d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6dc25d5fbff5d6277593b89974f950d8  openbox-3.3.1.tar.gz
+d5d52fa23fe91e1e3b53858a20d12757  openbox-3.4.2.tar.gz