diff --git a/fix-configure-check-libs.patch b/fix-configure-check-libs.patch
new file mode 100644
index 0000000..5fe2df0
--- /dev/null
+++ b/fix-configure-check-libs.patch
@@ -0,0 +1,32 @@
+Index: ocfs2-tools/configure.in
+===================================================================
+--- ocfs2-tools.orig/configure.in
++++ ocfs2-tools/configure.in
+@@ -255,9 +255,12 @@ if test "x$cpg_found" = "xyes"; then
+         # TRY="$TRY"
+ 
+         saved_LDFLAGS="$LDFLAGS"
+-        LDFLAGS="$LDFLAGS $TRY -lcpg"
++        saved_LIBS="$LIBS"
++        LDFLAGS="$LDFLAGS $TRY"
++        LIBS="-lcpg"
+         AC_LINK_IFELSE([AC_LANG_CALL([], [cpg_initialize])],
+         	       cpg_found=yes)
++        LIBS="$saved_LIBS"
+         LDFLAGS="$saved_LDFLAGS"
+ 
+         if test "x$cpg_found" = "xyes"; then
+@@ -294,9 +297,12 @@ if test "x$ckpt_found" = "xyes"; then
+         # TRY="$TRY"
+ 
+         saved_LDFLAGS="$LDFLAGS"
+-        LDFLAGS="$LDFLAGS $TRY -lSaCkpt"
++        saved_LIBS="$LIBS"
++        LDFLAGS="$LDFLAGS $TRY"
++        LIBS="-lSaCkpt"
+         AC_LINK_IFELSE([AC_LANG_CALL([], [saCkptInitialize])],
+         	       ckpt_found=yes)
++        LIBS="$saved_LIBS"
+         LDFLAGS="$saved_LDFLAGS"
+ 
+         if test "x$ckpt_found" = "xyes"; then
diff --git a/ocfs2-tools.changes b/ocfs2-tools.changes
index eb3e438..76ccadf 100644
--- a/ocfs2-tools.changes
+++ b/ocfs2-tools.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Jun 27 09:58:09 UTC 2010 - tserong@novell.com
+
+- Fix configure checks for cpg and SaCkpt libraries
+
 -------------------------------------------------------------------
 Mon Jun 14 15:19:45 UTC 2010 - lmb@novell.com
 
diff --git a/ocfs2-tools.spec b/ocfs2-tools.spec
index ab2fa69..64e3c71 100644
--- a/ocfs2-tools.spec
+++ b/ocfs2-tools.spec
@@ -70,6 +70,7 @@ Patch330:	0030-dx_dirs-fix-ocfs2_swap_dx_entry_list-for-big-endian.patch
 Patch331:	0031-dx_dirs-enable-metaecc-and-indexed-dirs-support-as-d.patch
 Patch401:	version-1.4.3.patch
 Patch402:	reflink-no-syscall.patch
+Patch500:	fix-configure-check-libs.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
@@ -189,6 +190,7 @@ Authors:
 %patch331 -p1
 %patch401 -p1
 %patch402 -p0
+%patch500 -p1
 
 %build
 %{?suse_update_config:%{suse_update_config -f}}