diff --git a/.cvsignore b/.cvsignore
index 24901d7..da32879 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
-openbox-3.3.1.tar.gz
+setlayout.c
+openbox-3.4.4.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 8a87357..a830bd6 100644
--- a/openbox.spec
+++ b/openbox.spec
@@ -1,35 +1,27 @@
-# 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:	6%{?dist}
+Version:	3.4.4
+Release:	1%{?dist}
 Summary:	A highly configurable and standards-compliant X11 window manager
 
 Group:		User Interface/Desktops
-License:	GPL
+License:	GPLv2+
 URL:		http://icculus.org/openbox
 Source0:	http://icculus.org/openbox/releases/%{name}-%{version}.tar.gz
-Source1:	openbox.desktop
+Source1:	http://icculus.org/openbox/tools/setlayout.c
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	%{_datadir}/themes
-Requires:	%{_datadir}/gnome/wm-properties
 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
@@ -50,7 +42,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
 
@@ -73,19 +65,22 @@ 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
 sed -ie 's|^runpath_var=LD_RUN_PATH$|runpath_var=DIE_RPATH_DIE|g' libtool
 make %{?_smp_mflags}
 
+gcc $RPM_OPT_FLAGS -o setlayout %{SOURCE1} -lX11
 
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
+install setlayout %{buildroot}%{_bindir}
+
 %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
@@ -95,23 +90,23 @@ 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}*
+%{_bindir}/setlayout
 %{_datadir}/themes/*/
 %{_datadir}/pixmaps/%{name}.png
-%{_datadir}/%{name}/
-%{_datadir}/gnome/wm-properties/%{name}.desktop
-%{_datadir}/xsessions/%{name}.desktop
-%exclude	%{_libdir}/*.la
+%{_datadir}/gnome/wm-properties/
+%{_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
@@ -125,6 +120,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Aug 08 2007 Miroslav Lichvar <mlichvar@redhat.com> - 3.4.4-1
+- Update to 3.4.4
+- Update license tag
+- Package setlayout tool
+- Don't depend on gnome-session (#242339)
+
 * Tue Mar 27 2007 Peter Gordon <peter@thecodergeek.com> - 3.3.1-6
 - Split shared libraries into a -libs subpackage to properly handle multilib
   setups. (This precludes the further need to %%ghost the byte-compiled
diff --git a/sources b/sources
index 5295ac1..c5d27ac 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-6dc25d5fbff5d6277593b89974f950d8  openbox-3.3.1.tar.gz
+76f263e1550532ae54fd53c3a49b2c71  setlayout.c
+7052597c29e75a77e67089683b8c24f7  openbox-3.4.4.tar.gz