diff --git a/.cvsignore b/.cvsignore
index 1b3b395..a3f76c3 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-nemiver-0.3.0.tar.bz2
+nemiver-0.4.0.tar.bz2
diff --git a/nemiver.spec b/nemiver.spec
index 2467408..cf7e9dd 100644
--- a/nemiver.spec
+++ b/nemiver.spec
@@ -1,6 +1,6 @@
 Name:		nemiver
-Version:	0.3.0
-Release:	6%{?dist}
+Version:	0.4.0
+Release:	1%{?dist}
 Summary:	A C/C++ Debugger for GNOME - point, click, debug!
 
 Group:		Development/Debuggers
@@ -22,13 +22,18 @@ BuildRequires:	libglademm24-devel >= 2.6.0
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 BuildRequires:	perl(XML::Parser)
+BuildRequires:	gnome-doc-utils >= 0.3.2
+BuildRequires:	libgnome-devel >= 2.0
 
 Requires(pre):	GConf2
 
 Requires(post):	GConf2
+Requires(post):	scrollkeeper
 
 Requires(preun):	GConf2
 
+Requires(postun):	scrollkeeper
+
 ## Needs hicolor-icon-theme so that the parent %%_datadir/icons/hicolor
 ## and its subtree directories are properly owned.
 Requires:	hicolor-icon-theme
@@ -39,6 +44,7 @@ Requires:	gdb
 Nemiver is an ongoing effort to write a standalone graphical debugger that
 integrates well in the GNOME desktop environment. It currently features a
 backend which uses the well known GNU Debugger (gdb) to debug C/C++ programs.
+The yelp package must be installed to make use of Nemiver's documentation.
 
 %package	devel
 Summary:	Development files for %{name}
@@ -62,7 +68,8 @@ developing applications that use %{name}.
 
 
 %build
-%configure --disable-static --disable-schemas-install 
+%configure --disable-static --disable-schemas-install		\
+	--disable-scrollkeeper
 ## 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
@@ -73,10 +80,10 @@ make %{?_smp_mflags}
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 %find_lang %{name}
-desktop-file-install --vendor fedora	\
+desktop-file-install --vendor fedora			\
 	--dir %{buildroot}%{_datadir}/applications	\
-	--remove-category=Application	\
-	--delete-original	\
+	--remove-category=Application			\
+	--delete-original				\
 	%{buildroot}/%{_datadir}/applications/%{name}.desktop
 
 
@@ -87,31 +94,26 @@ rm -rf %{buildroot}
 %pre
 if [ "$1" -gt 1 ]; then
 	export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source)
-	gconftool-2 --makefile-uninstall-rule \
-		%{_sysconfdir}/gconf/schemas/%{name}-dbgperspective.schemas >/dev/null ||:
-	gconftool-2 --makefile-uninstall-rule \
-		%{_sysconfdir}/gconf/schemas/%{name}-workbench.schemas >/dev/null ||:
+	gconftool-2 --makefile-uninstall-rule	\
+		%{_sysconfdir}/gconf/schemas/%{name}-*.schemas
 fi
 
 
 %post
 /sbin/ldconfig
 export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source)
-gconftool-2 --makefile-install-rule \
-		%{_sysconfdir}/gconf/schemas/%{name}-dbgperspective.schemas >/dev/null ||:
-gconftool-2 --makefile-install-rule \
-		%{_sysconfdir}/gconf/schemas/%{name}-workbench.schemas >/dev/null ||:
+gconftool-2 --makefile-install-rule	\
+		%{_sysconfdir}/gconf/schemas/%{name}-*.schemas
 touch --no-create %{_datadir}/icons/hicolor ||:
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
+scrollkeeper-update -q -o %{_datadir}/omf/%{name} ||:
 
 
 %preun
 if [ "$1" -eq 0 ]; then
 	export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source)
-	gconftool-2 --makefile-uninstall-rule \
-		%{_sysconfdir}/gconf/schemas/%{name}-dbgperspective.schemas >/dev/null ||:
-	gconftool-2 --makefile-uninstall-rule \
-		%{_sysconfdir}/gconf/schemas/%{name}-workbench.schemas >/dev/null ||:
+	gconftool-2 --makefile-uninstall-rule	\
+		%{_sysconfdir}/gconf/schemas/%{name}-*.schemas
 fi
 
 
@@ -119,6 +121,7 @@ fi
 /sbin/ldconfig
 touch --no-create %{_datadir}/icons/hicolor ||:
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor ||:
+scrollkeeper-update -q ||:
 
 
 %files -f %{name}.lang
@@ -128,11 +131,12 @@ touch --no-create %{_datadir}/icons/hicolor ||:
 %exclude %{_libdir}/*.la
 %{_libdir}/libnemivercommon.so.*
 %{_libdir}/%{name}/
-%{_sysconfdir}/gconf/schemas/%{name}-dbgperspective.schemas
-%{_sysconfdir}/gconf/schemas/%{name}-workbench.schemas
+%{_sysconfdir}/gconf/schemas/%{name}-*.schemas
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}.*
 %{_datadir}/%{name}/
+%{_datadir}/omf/%{name}/
+%{_datadir}/gnome/help/%{name}/
 
 %files devel
 %defattr(-,root,root,-)
@@ -143,6 +147,9 @@ touch --no-create %{_datadir}/icons/hicolor ||:
 
 
 %changelog
+* Sun Jun 03 2007 Peter Gordon <peter@thecodergeek.com> - 0.4.0-1
+- Update to new upstream release (0.4.0)
+
 * Sat Feb 17 2007 Peter Gordon <peter@thecodergeek.com> - 0.3.0-6
 - Remove chcon invocation entirely; as it is not needed.
 - Don't install libtool archives (.la files) of the plugins.
diff --git a/sources b/sources
index 71f0ea2..531784e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-289d46e97c125b95fdc5de9dd9736d7c  nemiver-0.3.0.tar.bz2
+0df4c48b0b1f09b46498a71344b4e3e8  nemiver-0.4.0.tar.bz2