diff --git a/dia-enable-html-doc.patch b/dia-enable-html-doc.patch
new file mode 100644
index 0000000..e8254e4
--- /dev/null
+++ b/dia-enable-html-doc.patch
@@ -0,0 +1,25 @@
+From 9d0973e21955205c7b334a4447e2418e246aaeeb Mon Sep 17 00:00:00 2001
+From: Mike Gorse <mgorse@linux-sh69.site>
+Date: Thu, 13 Feb 2014 18:44:37 -0600
+Subject: [PATCH] Always enable html docs
+
+---
+ configure.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index bfca467..50bef62 100644
+--- a/configure.in
++++ b/configure.in
+@@ -602,7 +602,7 @@ hardbook_ok=no
+ xsltproc_ok=no
+ if test "x$with_hardbooks" = "xno"; then
+   AM_CONDITIONAL(WITH_JW, test "xno" != "xno")
+-  AM_CONDITIONAL(WITH_HTMLDOC, test "xno" != "xno")
++  AM_CONDITIONAL(WITH_HTMLDOC, test "x$xsltproc" != "xno")
+   AM_CONDITIONAL(WITH_PDFDOC, test "xno" != "xno")
+   AM_CONDITIONAL(WITH_PSDOC, test "xno" != "xno")
+ else
+-- 
+1.8.5.2
+
diff --git a/dia.changes b/dia.changes
index d8dcf84..171e8f0 100644
--- a/dia.changes
+++ b/dia.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Feb 26 21:43:05 UTC 2014 - mgorse@suse.com
+
+- Remove libgnomeui support. Libgnomeui is deprecated, and session
+  management does not appear to be working well anyhow with GNOME 3.
+- Remove help files from GNOME directories
+- Add dia-enable-html-doc.patch -- always build html docs, as they
+  are needed for online help. Ie, don't require --with-hardbooks.
+
 -------------------------------------------------------------------
 Sat Dec 14 18:25:30 UTC 2013 - hrvoje.senjan@gmail.com
 
diff --git a/dia.spec b/dia.spec
index 4793898..c6bdd92 100644
--- a/dia.spec
+++ b/dia.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package dia
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,6 +17,7 @@
 
 
 Name:           dia
+BuildRequires:  docbook-toys
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
@@ -29,7 +30,6 @@ BuildRequires:  libEMF-devel
 BuildRequires:  libEMF-devel
 %endif
 %endif
-BuildRequires:  libgnomeui-devel
 BuildRequires:  libtool
 BuildRequires:  libxslt-devel
 BuildRequires:  python-devel
@@ -68,6 +68,8 @@ Patch20:        dia-libemf-64bit.patch
 Patch21:        dia-glib-2.35.patch
 # PATCH-FIX-UPSTREAM dia-use-recommended-freetype-include.patch bgo#720573 hrvoje.senjan@gmail.com -- Freetype upstream recommends using their macros together with ft2build include. Fix build with old and new freetype versions
 Patch22:        dia-use-recommended-freetype-include.patch
+# PATCH-FIX-OPENSUSE dia-enable-html-doc.patch mgorse@suse.com -- Always enable html docs if xsltproc present.
+Patch23:        dia-enable-html-doc.patch
 Url:            http://live.gnome.org/Dia
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Recommends:     %{name}-lang
@@ -96,6 +98,7 @@ translation-update-upstream
 %patch20 -p1
 %patch21 -p1
 %patch22 -p1
+%patch23 -p1
 cp $RPM_SOURCE_DIR/font-test*dia .
 
 %build
@@ -104,7 +107,7 @@ intltoolize --force
 %configure\
 	--disable-static\
 	--enable-db2html\
-	--enable-gnome\
+	--disable-gnome\
 	--with-python\
 	--with-cairo\
 	--with-swig
@@ -114,10 +117,6 @@ make %{?_smp_mflags}
 %makeinstall
 find %{buildroot} -type f -name "*.la" -exec %{__rm} -fv {} +
 %suse_update_desktop_file -r -N Dia -C "" -G "Diagram Editor" dia Office FlowChart
-# Workaround for bgo#581537: the C help is just a symlink to the en help. But
-# find_lang doesn't like this
-rm %{buildroot}%{_datadir}/gnome/help/dia/C
-mv %{buildroot}%{_datadir}/gnome/help/dia/en %{buildroot}%{_datadir}/gnome/help/dia/C
 %find_lang %{name} %{?no_lang_C}
 # No need for mime-info-to-mime, application/x-dia-diagram is defined in freedesktop.org.xml
 rm -r $RPM_BUILD_ROOT%{_datadir}/mime-info
@@ -141,13 +140,6 @@ rm samples/Makefile* samples/*png
 %files
 %defattr(-,root,root)
 %doc AUTHORS COPYING ChangeLog INSTALL KNOWN_BUGS NEWS README TODO samples/ font-test*dia
-%dir %{_datadir}/gnome/
-%dir %{_datadir}/gnome/help/
-%dir %{_datadir}/gnome/help/%{name}/
-%doc %{_datadir}/gnome/help/%{name}/C/
-%dir %{_datadir}/omf/
-%dir %{_datadir}/omf/%{name}/
-%doc %{_datadir}/omf/%{name}/%{name}-C.omf
 %{_bindir}/*
 %{_libdir}/dia
 %{_datadir}/applications/*.desktop