diff --git a/.cvsignore b/.cvsignore
index 15ad8db..3132f3e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-uuid-1.4.2.tar.gz
+uuid-1.5.0.tar.gz
diff --git a/ossp-uuid.patch b/ossp-uuid.patch
new file mode 100644
index 0000000..b84bbb4
--- /dev/null
+++ b/ossp-uuid.patch
@@ -0,0 +1,230 @@
+diff -urN uuid-1.5.0.orig/Makefile.PL uuid-1.5.0/Makefile.PL
+--- uuid-1.5.0.orig/Makefile.PL	2006-01-15 12:37:43.000000000 -0600
++++ uuid-1.5.0/Makefile.PL	2006-07-29 14:49:23.000000000 -0500
+@@ -44,7 +44,7 @@
+ all pure_all:
+ 	\@if [ ! -d build ]; then mkdir build; fi
+ 	\@if [ ! -f build/Makefile ]; then (cd build && ../configure --disable-shared); fi
+-	\@if [ ! -f build/libuuid.la ]; then (cd build && \$(MAKE) \$(MFLAGS) libuuid.la); fi
++	\@if [ ! -f build/libossp-uuid.la ]; then (cd build && \$(MAKE) \$(MFLAGS) libossp-uuid.la); fi
+ 	\@if [ ! -f perl/Makefile ]; then (cd perl && \$(PERL) Makefile.PL \$(ARGS)); fi
+ 	\@cd perl && \$(MAKE) \$(MFLAGS) \$\@
+ 
+diff -urN uuid-1.5.0.orig/Makefile.in uuid-1.5.0/Makefile.in
+--- uuid-1.5.0.orig/Makefile.in	2006-05-11 04:37:27.000000000 -0500
++++ uuid-1.5.0/Makefile.in	2006-07-29 15:37:47.000000000 -0500
+@@ -61,13 +61,13 @@
+ PHP         = @PHP@
+ PG_CONFIG   = @PG_CONFIG@
+ 
+-LIB_NAME    = libuuid.la
++LIB_NAME    = libossp-uuid.la
+ LIB_OBJS    = uuid.lo uuid_md5.lo uuid_sha1.lo uuid_prng.lo uuid_mac.lo uuid_ui64.lo uuid_ui128.lo uuid_str.lo
+ 
+-DCE_NAME    = libuuid_dce.la
++DCE_NAME    = libossp-uuid_dce.la
+ DCE_OBJS    = uuid_dce.lo $(LIB_OBJS)
+ 
+-CXX_NAME    = libuuid++.la
++CXX_NAME    = libossp-uuid++.la
+ CXX_OBJS    = uuid++.lo $(LIB_OBJS)
+ 
+ PRG_NAME    = uuid
+@@ -78,10 +78,10 @@
+ PERL_NAME   = $(S)/perl/blib/lib/OSSP/uuid.pm
+ PERL_OBJS   = $(S)/perl/uuid.pm
+ 
+-PHP_NAME    = $(S)/php/modules/uuid.so
++PHP_NAME    = $(S)/php/modules/ossp-uuid.so
+ PHP_OBJS    = $(S)/php/uuid.c
+ 
+-PGSQL_NAME  = $(S)/pgsql/libuuid.so
++PGSQL_NAME  = $(S)/pgsql/libossp-uuid.so
+ PGSQL_OBJS  = $(S)/pgsql/uuid.c
+ 
+ TARGETS     = $(LIB_NAME) @DCE_NAME@ @CXX_NAME@ $(PRG_NAME) @PERL_NAME@ @PHP_NAME@ @PGSQL_NAME@
+@@ -230,7 +230,7 @@
+ 	$(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(mandir)/man1
+ 	$(SHTOOL) install -c -m 755 uuid-config $(DESTDIR)$(bindir)/
+ 	$(SHTOOL) install -c -m 644 $(S)/uuid-config.1 $(DESTDIR)$(mandir)/man1/
+-	$(SHTOOL) install -c -m 644 $(S)/uuid.pc $(DESTDIR)$(libdir)/pkgconfig/
++	$(SHTOOL) install -c -m 644 $(S)/uuid.pc $(DESTDIR)$(libdir)/pkgconfig/ossp-uuid.pc
+ 	$(SHTOOL) install -c -m 644 uuid.h $(DESTDIR)$(includedir)/
+ 	-@if [ ".$(WITH_DCE)" = .yes ]; then \
+ 	    echo "$(SHTOOL) install -c -m 644 $(S)/uuid_dce.h $(DESTDIR)$(includedir)/"; \
+@@ -240,17 +240,17 @@
+ 	    echo "$(SHTOOL) install -c -m 644 $(S)/uuid++.hh $(DESTDIR)$(includedir)/"; \
+ 	    $(SHTOOL) install -c -m 644 $(S)/uuid++.hh $(DESTDIR)$(includedir)/; \
+ 	fi
+-	$(SHTOOL) install -c -m 644 $(S)/uuid.3 $(DESTDIR)$(mandir)/man3/
++	$(SHTOOL) install -c -m 644 $(S)/uuid.3 $(DESTDIR)$(mandir)/man3/ossp-uuid.3
+ 	-@if [ ".$(WITH_CXX)" = .yes ]; then \
+ 	    echo "$(SHTOOL) install -c -m 644 $(S)/uuid++.3 $(DESTDIR)$(mandir)/man3/"; \
+ 	    $(SHTOOL) install -c -m 644 $(S)/uuid++.3 $(DESTDIR)$(mandir)/man3/; \
+ 	fi
+-	@$(LIBTOOL) --mode=install $(SHTOOL) install -c -m 644 libuuid.la $(DESTDIR)$(libdir)/
++	@$(LIBTOOL) --mode=install $(SHTOOL) install -c -m 644 libossp-uuid.la $(DESTDIR)$(libdir)/
+ 	-@if [ ".$(WITH_DCE)" = .yes ]; then \
+-	    $(LIBTOOL) --mode=install $(SHTOOL) install -c -m 644 libuuid_dce.la $(DESTDIR)$(libdir)/; \
++	    $(LIBTOOL) --mode=install $(SHTOOL) install -c -m 644 libossp-uuid_dce.la $(DESTDIR)$(libdir)/; \
+ 	fi
+ 	-@if [ ".$(WITH_CXX)" = .yes ]; then \
+-	    $(LIBTOOL) --mode=install $(SHTOOL) install -c -m 644 libuuid++.la $(DESTDIR)$(libdir)/; \
++	    $(LIBTOOL) --mode=install $(SHTOOL) install -c -m 644 libossp-uuid++.la $(DESTDIR)$(libdir)/; \
+ 	fi
+ 	@$(LIBTOOL) --mode=install $(SHTOOL) install -c -s -m 755 uuid $(DESTDIR)$(bindir)/
+ 	$(SHTOOL) install -c -m 644 $(S)/uuid.1 $(DESTDIR)$(mandir)/man1/
+@@ -268,14 +268,14 @@
+ uninstall:
+ 	-$(RM) $(DESTDIR)$(mandir)/man1/uuid.1
+ 	-@$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(bindir)/uuid
+-	-@$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(libdir)/libuuid.la
++	-@$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(libdir)/libossp-uuid.la
+ 	-@if [ ".$(WITH_DCE)" = .yes ]; then \
+-	    $(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(libdir)/libuuid_dce.la; \
++	    $(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(libdir)/libossp-uuid_dce.la; \
+ 	fi
+ 	-@if [ ".$(WITH_CXX)" = .yes ]; then \
+-	    $(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(libdir)/libuuid++.la; \
++	    $(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(libdir)/libossp-uuid++.la; \
+ 	fi
+-	-$(RM) $(DESTDIR)$(mandir)/man3/uuid.3
++	-$(RM) $(DESTDIR)$(mandir)/man3/ossp-uuid.3
+ 	-@if [ ".$(WITH_CXX)" = .yes ]; then \
+ 	    echo "$(RM) $(DESTDIR)$(mandir)/man3/uuid++.3"; \
+ 	    $(RM) $(DESTDIR)$(mandir)/man3/uuid++.3; \
+@@ -289,7 +289,7 @@
+ 	    echo "$(RM) $(DESTDIR)$(includedir)/uuid++.hh"; \
+ 	    $(RM) $(DESTDIR)$(includedir)/uuid++.hh; \
+ 	fi
+-	-$(RM) $(DESTDIR)$(libdir)/pkgconfig/uuid.pc
++	-$(RM) $(DESTDIR)$(libdir)/pkgconfig/ossp-uuid.pc
+ 	-$(RM) $(DESTDIR)$(mandir)/man1/uuid-config.1
+ 	-$(RM) $(DESTDIR)$(bindir)/uuid-config
+ 	-$(RMDIR) $(DESTDIR)$(mandir)/man1 >/dev/null 2>&1 || $(TRUE)
+diff -urN uuid-1.5.0.orig/perl/Makefile.PL uuid-1.5.0/perl/Makefile.PL
+--- uuid-1.5.0.orig/perl/Makefile.PL	2006-01-13 00:44:33.000000000 -0600
++++ uuid-1.5.0/perl/Makefile.PL	2006-07-29 14:51:01.000000000 -0500
+@@ -33,9 +33,9 @@
+ use ExtUtils::MakeMaker;
+ 
+ #   determine source directory
+-my ($srcdir) = map { my $d = $_; $d =~ s/\/libuuid\.la$//; $d }
+-               grep { -f $_ } ("../libuuid.la", glob("../*/libuuid.la"))
+-    or die "no source directory found (where libuuid.la is located)";
++my ($srcdir) = map { my $d = $_; $d =~ s/\/libossp-uuid\.la$//; $d }
++               grep { -f $_ } ("../libossp-uuid.la", glob("../*/libossp-uuid.la"))
++    or die "no source directory found (where libossp-uuid.la is located)";
+ 
+ #   determine extra build options
+ my $compat = 0;
+@@ -47,7 +47,7 @@
+     VERSION_FROM      => 'uuid.pm',
+     ABSTRACT_FROM     => 'uuid.pod',
+     PREREQ_PM         => {},
+-    LIBS              => [ "-L$srcdir/.libs -L$srcdir -luuid" ],
++    LIBS              => [ "-L$srcdir/.libs -L$srcdir -lossp-uuid" ],
+     DEFINE            => '',
+     INC               => "-I. -I$srcdir",
+     PM                => { 'uuid.pm'   => '$(INST_LIBDIR)/uuid.pm',
+diff -urN uuid-1.5.0.orig/pgsql/Makefile uuid-1.5.0/pgsql/Makefile
+--- uuid-1.5.0.orig/pgsql/Makefile	2006-01-12 14:31:51.000000000 -0600
++++ uuid-1.5.0/pgsql/Makefile	2006-07-29 19:07:46.000000000 -0500
+@@ -17,13 +17,13 @@
+ top_builddir      := $(dir $(PGXS))../..
+ include           $(top_builddir)/src/Makefile.global
+     
+-NAME              = uuid
++NAME              = ossp-uuid
+ OBJS              = uuid.o
+ SO_MAJOR_VERSION  = 1
+ SO_MINOR_VERSION  = 0
+ 
+ override CPPFLAGS := -I.. $(CPPFLAGS)
+-SHLIB_LINK        := -L../.libs -luuid
++SHLIB_LINK        := -L../.libs -lossp-uuid
+ SHLIB_LINK        += $(shell test $(shell uname -s) = FreeBSD && echo "-Wl,-Bsymbolic")
+ rpath             :=
+ 
+@@ -33,16 +33,16 @@
+ include           $(top_builddir)/src/Makefile.shlib
+ 
+ uuid.sql: uuid.sql.in
+-	sed -e 's;@MODULE_PATHNAME@;$(DESTDIR)$(pkglibdir)/uuid$(DLSUFFIX);g' <uuid.sql.in >uuid.sql
++	sed -e 's;@MODULE_PATHNAME@;$(DESTDIR)$(pkglibdir)/ossp-uuid$(DLSUFFIX);g' <uuid.sql.in >uuid.sql
+ 
+ install: all
+ 	$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
+ 	$(mkinstalldirs) $(DESTDIR)$(datadir)
+-	$(INSTALL_SHLIB) $(shlib) $(DESTDIR)$(pkglibdir)/uuid$(DLSUFFIX)
++	$(INSTALL_SHLIB) $(shlib) $(DESTDIR)$(pkglibdir)/ossp-uuid$(DLSUFFIX)
+ 	$(INSTALL_DATA) uuid.sql $(DESTDIR)$(datadir)/uuid.sql
+ 
+ uninstall:
+-	-rm -f $(DESTDIR)$(pkglibdir)/uuid$(DLSUFFIX)
++	-rm -f $(DESTDIR)$(pkglibdir)/ossp-uuid$(DLSUFFIX)
+ 	-rm -f $(DESTDIR)$(datadir)/uuid.sql
+ 
+ clean distclean: clean-lib
+diff -urN uuid-1.5.0.orig/php/Makefile.local uuid-1.5.0/php/Makefile.local
+--- uuid-1.5.0.orig/php/Makefile.local	2006-04-04 09:58:43.000000000 -0500
++++ uuid-1.5.0/php/Makefile.local	2006-07-29 15:38:23.000000000 -0500
+@@ -48,7 +48,7 @@
+ 	@version=`$(PHP)-config --version | sed -e 's;^\([0-9]\).*$$;\1;'`; extdir="$(EXTDIR)"; \
+ 	echo "installing PHP$$version API into $$extdir"; \
+ 	./build/shtool mkdir -f -p -m 755 $(DESTDIR)$$extdir; \
+-	./build/shtool install -c -m 755 modules/uuid.so $(DESTDIR)$$extdir/uuid.so; \
++	./build/shtool install -c -m 755 modules/uuid.so $(DESTDIR)$$extdir/ossp-uuid.so; \
+ 	./build/shtool install -c -m 644 uuid.php$$version $(DESTDIR)$$extdir/uuid.php
+ 
+ clean:
+diff -urN uuid-1.5.0.orig/php/config.m4 uuid-1.5.0/php/config.m4
+--- uuid-1.5.0.orig/php/config.m4	2006-01-13 00:44:34.000000000 -0600
++++ uuid-1.5.0/php/config.m4	2006-07-29 16:14:57.000000000 -0500
+@@ -34,7 +34,7 @@
+     PHP_NEW_EXTENSION(uuid, uuid.c, $ext_shared)
+     AC_DEFINE(HAVE_UUID, 1, [Have OSSP uuid library])
+     PHP_ADD_LIBPATH([..], )
+-    PHP_ADD_LIBRARY([uuid],, UUID_SHARED_LIBADD)
++    PHP_ADD_LIBRARY([ossp-uuid],, UUID_SHARED_LIBADD)
+     PHP_ADD_INCLUDE([..])
+     PHP_SUBST(UUID_SHARED_LIBADD)
+     dnl  avoid conflict with libc's uuid_create(3)
+diff -urN uuid-1.5.0.orig/php/uuid.ts uuid-1.5.0/php/uuid.ts
+--- uuid-1.5.0.orig/php/uuid.ts	2006-01-13 00:44:34.000000000 -0600
++++ uuid-1.5.0/php/uuid.ts	2006-07-29 15:41:45.000000000 -0500
+@@ -34,9 +34,9 @@
+ 
+ $php_version = $argv[1];
+ 
+-print "++ loading DSO uuid.so (low-level API)\n";
++print "++ loading DSO ossp-uuid.so (low-level API)\n";
+ if (!extension_loaded('uuid')) {
+-    dl('modules/uuid.so');
++    dl('modules/ossp-uuid.so');
+ }
+ 
+ print "++ loading PHP uuid.php${php_version} (high-level API)\n";
+diff -urN uuid-1.5.0.orig/uuid-config.in uuid-1.5.0/uuid-config.in
+--- uuid-1.5.0.orig/uuid-config.in	2006-01-13 00:44:30.000000000 -0600
++++ uuid-1.5.0/uuid-config.in	2006-07-29 15:27:38.000000000 -0500
+@@ -120,7 +120,7 @@
+             output_extra="$output_extra $uuid_ldflags"
+             ;;
+         --libs)
+-            output="$output -luuid"
++            output="$output -lossp-uuid"
+             output_extra="$output_extra $uuid_libs"
+             ;;
+         * )
+diff -urN uuid-1.5.0.orig/uuid.pc.in uuid-1.5.0/uuid.pc.in
+--- uuid-1.5.0.orig/uuid.pc.in	2006-01-13 00:44:30.000000000 -0600
++++ uuid-1.5.0/uuid.pc.in	2006-07-29 15:27:48.000000000 -0500
+@@ -37,6 +37,6 @@
+ Version: @UUID_VERSION_RAW@
+ URL: http://www.ossp.org/pkg/lib/uuid/
+ Cflags: -I${includedir}
+-Libs: -L${libdir} -luuid
++Libs: -L${libdir} -lossp-uuid
+ Libs.private: @LIBS@
+ 
diff --git a/sources b/sources
index 0ebb362..9405269 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fdfe93bc134dfb73814456c3b444dda1  uuid-1.4.2.tar.gz
+b0a428352fe9fb5fdd241406af04c08b  uuid-1.5.0.tar.gz
diff --git a/uuid.spec b/uuid.spec
index 5e354d3..6947311 100644
--- a/uuid.spec
+++ b/uuid.spec
@@ -1,11 +1,12 @@
 Name:           uuid
-Version:        1.4.2
-Release:        4%{?dist}
+Version:        1.5.0
+Release:        1%{?dist}
 Summary:        Universally Unique Identifier library
 License:        MIT
 Group:          System Environment/Libraries
 URL:            http://www.ossp.org/pkg/lib/uuid/
 Source0:        ftp://ftp.ossp.org/pkg/lib/uuid/uuid-%{version}.tar.gz
+Patch0:         ossp-uuid.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  /usr/bin/libtool
 
@@ -95,6 +96,11 @@ DCE development headers and libraries for OSSP uuid.
 
 %prep
 %setup -q
+%patch0 -p1
+
+pushd pgsql
+make realclean
+popd
 
 %build
 # Build the library.
@@ -178,25 +184,25 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog HISTORY NEWS PORTING README SEEALSO THANKS TODO USERS
 %{_bindir}/uuid
-%{_libdir}/libuuid.so.*
+%{_libdir}/libossp-uuid.so.*
 %{_mandir}/man1/*
 
 %files devel
 %defattr(-,root,root,-)
 %{_bindir}/uuid-config
 %{_includedir}/uuid.h
-%{_libdir}/libuuid.so
-%{_libdir}/pkgconfig/uuid.pc
-%{_mandir}/man3/uuid.3*
+%{_libdir}/libossp-uuid.so
+%{_libdir}/pkgconfig/ossp-uuid.pc
+%{_mandir}/man3/ossp-uuid.3*
 
 %files c++
 %defattr(-,root,root,-)
-%{_libdir}/libuuid++.so.*
+%{_libdir}/libossp-uuid++.so.*
 
 %files c++-devel
 %defattr(-,root,root,-)
 %{_includedir}/uuid++.hh
-%{_libdir}/libuuid++.so
+%{_libdir}/libossp-uuid++.so
 %{_mandir}/man3/uuid++.3*
 
 %files perl
@@ -218,14 +224,20 @@ rm -rf $RPM_BUILD_ROOT
 
 %files dce
 %defattr(-,root,root,-)
-%{_libdir}/libuuid_dce.so.*
+%{_libdir}/libossp-uuid_dce.so.*
 
 %files dce-devel
 %defattr(-,root,root,-)
 %{_includedir}/uuid_dce.h
-%{_libdir}/libuuid_dce.so
+%{_libdir}/libossp-uuid_dce.so
 
 %changelog
+* Sat Jul 29 2006 Steven Pritchard <steve@kspei.com> 1.5.0-1
+- Update to 1.5.0.
+- Rename libuuid* to libossp-uuid*, uuid.3 to ossp-uuid.3, and uuid.pc
+  to ossp-uuid.pc to avoid conflicts with e2fsprogs-devel (#198520).
+- Clean out the pgsql directory.  (Some cruft shipped with this release.)
+
 * Wed May 24 2006 Steven Pritchard <steve@kspei.com> 1.4.2-4
 - Remove static php module.