diff --git a/ocfs2-mount-gcc45.patch b/ocfs2-mount-gcc45.patch
new file mode 100644
index 0000000..f26fb38
--- /dev/null
+++ b/ocfs2-mount-gcc45.patch
@@ -0,0 +1,21 @@
+Index: mount.ocfs2/mount.ocfs2.c
+===================================================================
+--- mount.ocfs2/mount.ocfs2.c.orig
++++ mount.ocfs2/mount.ocfs2.c
+@@ -261,7 +261,7 @@ int main(int argc, char **argv)
+ 	char *extra = NULL;
+ 	int dev_ro = 0;
+ 	char *hbstr = NULL;
+-	char stackstr[strlen(OCFS2_CLUSTER_STACK_ARG) + OCFS2_STACK_LABEL_LEN + 1] = "";
++	char stackstr[strlen(OCFS2_CLUSTER_STACK_ARG) + OCFS2_STACK_LABEL_LEN + 1];
+ 	ocfs2_filesys *fs = NULL;
+ 	struct o2cb_cluster_desc cluster;
+ 	struct o2cb_region_desc desc;
+@@ -269,6 +269,7 @@ int main(int argc, char **argv)
+ 	int hb_started = 0;
+ 	struct stat statbuf;
+ 
++	stackstr[0] = '\0';
+ 	initialize_ocfs_error_table();
+ 	initialize_o2dl_error_table();
+ 	initialize_o2cb_error_table();
diff --git a/ocfs2-tools-dynamic-com-err.patch b/ocfs2-tools-dynamic-com-err.patch
new file mode 100644
index 0000000..9dc8f95
--- /dev/null
+++ b/ocfs2-tools-dynamic-com-err.patch
@@ -0,0 +1,12 @@
+Index: o2image/Makefile
+===================================================================
+--- o2image/Makefile.orig
++++ o2image/Makefile
+@@ -32,6 +32,6 @@ OBJS = $(subst .c,.o,$(CFILES))
+ DIST_FILES = $(CFILES) $(HFILES) o2image.8.in
+ 
+ o2image: $(OBJS) $(LIBOCFS2_DEPS)
+-	$(LINK) -static $(GLIB_LIBS) $(LIBOCFS2_LIBS) $(COM_ERR_LIBS) -lpthread
++	$(LINK) -static $(GLIB_LIBS) $(LIBOCFS2_LIBS) -Wl,-Bdynamic $(COM_ERR_LIBS) -lpthread
+ 
+ include $(TOPDIR)/Postamble.make
diff --git a/ocfs2-tools.changes b/ocfs2-tools.changes
index 1005174..34e323b 100644
--- a/ocfs2-tools.changes
+++ b/ocfs2-tools.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Apr  9 07:25:41 UTC 2010 - aj@suse.de
+
+- Fix build.
+
 -------------------------------------------------------------------
 Wed Sep 30 08:03:29 UTC 2009 - aj@suse.de
 
diff --git a/ocfs2-tools.spec b/ocfs2-tools.spec
index db6b6c3..a88fa2d 100644
--- a/ocfs2-tools.spec
+++ b/ocfs2-tools.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package ocfs2-tools (Version 1.4.1)
 #
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 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
@@ -19,11 +19,11 @@
 
 
 Name:           ocfs2-tools
-BuildRequires:  e2fsprogs-devel glib2-devel libdlm-devel libopenais-devel libpacemaker-devel libxml2-devel libxslt-devel python-devel python-gtk-devel readline-devel update-desktop-files
+BuildRequires:  e2fsprogs-devel glib2-devel libcom_err-devel libdlm-devel libopenais-devel libpacemaker-devel libxml2-devel libxslt-devel python-devel python-gtk-devel readline-devel update-desktop-files
 Summary:        Oracle Cluster File System 2 Core Tools
 Version:        1.4.1
-Release:        24
-License:        GPL v2 only ; GPL v2 or later
+Release:        25
+License:        GPLv2+
 Group:          System/Filesystems
 Source:         ocfs2-tools.tar.bz2
 Source1:        o2cb.ocf
@@ -38,6 +38,8 @@ Patch103:       ocfs2console-extraoption-fix.diff
 Patch104:       ocfs2console-pop-display-warning.diff
 Patch105:       ocfs2_controld-retry-470741.diff
 Patch106:       tunefs.ocfs2.8.in_more_options.diff
+Patch107:       ocfs2-mount-gcc45.patch
+Patch108:       ocfs2-tools-dynamic-com-err.patch
 Url:            http://oss.oracle.com/projects/ocfs2-tools/
 Requires:       net-tools, modutils, e2fsprogs, /sbin/chkconfig, glib2 >= 2.2.3
 PreReq:         %insserv_prereq %fillup_prereq
@@ -62,7 +64,7 @@ Authors:
     Oracle Corporation
 
 %package -n ocfs2console
-License:        GPL v2 or later
+License:        GPLv2+
 Summary:        Oracle Cluster Filesystem 2 GUI tools
 Group:          System/Filesystems
 Obsoletes:      ocfs2-support
@@ -82,7 +84,7 @@ Authors:
     Oracle Corporation
 
 %package devel
-License:        GPL v2 or later
+License:        GPLv2+
 Summary:        Oracle Cluster File System 2 Development files
 Group:          System/Filesystems
 Requires:       ocfs2-tools = %{version}, libcom_err, libcom_err-devel
@@ -100,7 +102,7 @@ Authors:
     Oracle Corporation
 
 %package o2cb
-License:        GPL v2 or later
+License:        GPLv2+
 Summary:        Oracle Cluster File System 2 Core Tools
 Group:          System/Filesystems
 Requires:       ocfs2-tools = %{version}
@@ -130,6 +132,8 @@ Authors:
 %patch104 -p1
 %patch105 -p1
 %patch106 -p1
+%patch107 -p0
+%patch108 -p0
 
 %build
 # disable as-needed to fix configure checks