diff --git a/.cvsignore b/.cvsignore
index 99ddd6f..8b6d4af 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libcgroup-0.1c.tar.bz2
+libcgroup-0.31.tar.bz2
diff --git a/fix_makefile_to_link_with_builddir.patch b/fix_makefile_to_link_with_builddir.patch
new file mode 100644
index 0000000..a271709
--- /dev/null
+++ b/fix_makefile_to_link_with_builddir.patch
@@ -0,0 +1,41 @@
+Index: v0.31/Makefile.in
+===================================================================
+--- v0.31.orig/Makefile.in	2008-09-05 19:52:44.000000000 +0530
++++ v0.31/Makefile.in	2008-09-05 20:33:01.000000000 +0530
+@@ -14,7 +14,7 @@ YACC_DEBUG=-t
+ DEBUG=-DDEBUG
+ INC=-I.
+ LIBS= -lcgroup -lpthread
+-LDFLAGS=@LDFLAGS@ -L .
++LDFLAGS=@LDFLAGS@ -L . -L $(RPM_BUILD_ROOT)
+ YACC=@YACC@
+ LEX=@LEX@
+ bindir=@bindir@
+@@ -38,7 +38,7 @@ cgconfigparser: libcgroup.so config.c y.
+ cgexec: libcgroup.so cgexec.c libcgroup.h
+ 	$(CC) $(CFLAGS) -Wall -o $@ cgexec.c $(LDFLAGS) $(LIBS)
+ 
+-cgclassify: cgclassify.c
++cgclassify: libcgroup.so cgclassify.c
+ 	$(CC) $(CFLAGS) -Wall -o $@ cgclassify.c $(LDFLAGS) $(LIBS)
+ 
+ y.tab.c: parse.y lex.yy.c
+@@ -59,14 +59,14 @@ pam_cgroup.so: pam_cgroup.c
+ 	$(CC) $(CFLAGS) -shared -fPIC -Wall -o $@ pam_cgroup.c $(LDFLAGS) \
+ 	$(LIBS) -lpam
+ 
+-install: libcgroup.so cgexec cgclassify
++install: libcgroup.so cgexec cgclassify cgconfigparser
+ 	$(INSTALL_DATA) -D libcgroup.h $(DESTDIR)$(includedir)/libcgroup.h
+ 	$(INSTALL) -D libcgroup.so $(DESTDIR)$(libdir)/libcgroup-$(PACKAGE_VERSION).so
+ 	ln -sf libcgroup-$(PACKAGE_VERSION).so $(DESTDIR)$(libdir)/libcgroup.so.$(VERSION)
+ 	ln -sf libcgroup.so.$(VERSION) $(DESTDIR)$(libdir)/libcgroup.so
+-	$(INSTALL) -D cgconfigparser $(DESTDIR)$(sbindir)
+-	$(INSTALL) cgexec $(DESTDIR)$(bindir)/cgexec
+-	$(INSTALL) cgclassify $(DESTDIR)$(bindir)/cgclassify
++	$(INSTALL) -D cgconfigparser $(DESTDIR)$(sbindir)/cgconfigparser
++	$(INSTALL) -D cgexec $(DESTDIR)$(bindir)/cgexec
++	$(INSTALL) -D cgclassify $(DESTDIR)$(bindir)/cgclassify
+ 
+ uninstall: libcgroup.so
+ 	rm -f $(DESTDIR)$(includedir)/libcgroup.h
diff --git a/fix_overflow.patch b/fix_overflow.patch
new file mode 100644
index 0000000..7f7ba36
--- /dev/null
+++ b/fix_overflow.patch
@@ -0,0 +1,13 @@
+Index: v0.31/api.c
+===================================================================
+--- v0.31.orig/api.c	2008-09-05 19:52:44.000000000 +0530
++++ v0.31/api.c	2008-09-05 20:06:53.000000000 +0530
+@@ -1041,7 +1041,7 @@ struct cgroup *cgroup_get_cgroup(struct 
+ 					cg_mount_table[i].name))
+ 			continue;
+ 
+-		strncat(path, cgroup->name, sizeof(path));
++		strncat(path, cgroup->name, sizeof(path) - strlen(path));
+ 
+ 		if (access(path, F_OK))
+ 			continue;
diff --git a/libcgroup.spec b/libcgroup.spec
index 5c7b4af..f8a9d1e 100644
--- a/libcgroup.spec
+++ b/libcgroup.spec
@@ -1,11 +1,13 @@
 Name: libcgroup
 Summary: Tools and libraries to control and monitor control groups
 Group: Development/Libraries
-Version: 0.1c
-Release:        3%{?dist}
+Version: 0.31
+Release:        1%{?dist}
 License: LGPLv2+
 URL: http://libcg.sourceforge.net/
 Source0: http://downloads.sourceforge.net/libcg/%{name}-%{version}.tar.bz2
+patch0: http://downloads.sourceforge.net/libcg/fix_overflow.patch
+patch1: http://downloads.sourceforge.net/libcg/fix_makefile_to_link_with_builddir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: byacc
 BuildRequires: flex
@@ -27,6 +29,8 @@ provide scripts to manage that configuration.
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
 %configure
@@ -48,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{_libdir}/libcgroup-%{version}.so
 %{_libdir}/libcgroup.so.*
+%{_bindir}/cgexec
+%{_bindir}/cgclassify
+%{_sbindir}/cgconfigparser
 %doc COPYING INSTALL
 
 %files devel
@@ -58,6 +65,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Sep 11 2008 Dhaval Giani <dhaval@linux-vnet.ibm.com> 0.31-1
+- Update to latest upstream
 * Sat Aug 2 2008 Dhaval Giani <dhaval@linux.vnet.ibm.com> 0.1c-3
 - Change release to fix broken upgrade path
 * Wed Jun 11 2008 Dhaval Giani <dhaval@linux.vnet.ibm.com> 0.1c-1
diff --git a/sources b/sources
index dced636..50cbfa6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6c9fd0525e1b7e05911588b1eceb7246  libcgroup-0.1c.tar.bz2
+494cb429edd57b5233840cbe3fdcf6a7  libcgroup-0.31.tar.bz2