diff --git a/lvm2.spec b/lvm2.spec
index d003533..2808c23 100644
--- a/lvm2.spec
+++ b/lvm2.spec
@@ -1,4 +1,4 @@
-%define device_mapper_version 1.02.34
+%define device_mapper_version 1.02.35
 %define corosync_version 1.0.0-1
 %define clusterlib_version 3.0.0-20
 
@@ -7,8 +7,8 @@
 
 Summary: Userland logical volume management tools 
 Name: lvm2
-Version: 2.02.49
-Release: 2%{?dist}
+Version: 2.02.50
+Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Base
 URL: http://sources.redhat.com/lvm2
@@ -48,7 +48,7 @@ or more physical volumes and creating one or more logical volumes
 %define _sbindir /sbin
 %define _libdir /%{_lib}
 
-%configure --enable-lvm1_fallback --enable-fsadm --with-clvmd=corosync --with-cluster=internal --with-pool=internal --with-user= --with-group= --with-dmdir=device-mapper.%{device_mapper_version} --with-usrlibdir=/usr/%{_lib} --with-usrsbindir=/usr/sbin --with-device-uid=0 --with-device-gid=6 --with-device-mode=0660 --enable-pkgconfig 
+%configure --enable-lvm1_fallback --enable-fsadm --with-clvmd=corosync --with-cluster=internal --with-pool=internal --with-user= --with-group= --with-usrlibdir=/usr/%{_lib} --with-usrsbindir=/usr/sbin --with-device-uid=0 --with-device-gid=6 --with-device-mode=0660 --enable-pkgconfig --enable-applib --enable-cmdlib
 make %{?_smp_mflags}
 
 %install
@@ -62,6 +62,7 @@ install -m 0600 /dev/null $RPM_BUILD_ROOT/etc/lvm/cache/.cache
 mkdir -p -m755 $RPM_BUILD_ROOT/etc/rc.d/init.d
 install scripts/clvmd_init_red_hat $RPM_BUILD_ROOT/etc/rc.d/init.d/clvmd
 install -m 0755 scripts/lvmconf.sh $RPM_BUILD_ROOT/sbin/lvmconf
+mv $RPM_BUILD_ROOT/usr/include/lvm.h $RPM_BUILD_ROOT/usr/include/lvm2app.h
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -168,6 +169,45 @@ rm -rf $RPM_BUILD_ROOT
 %dir /etc/lvm/archive
 %dir /var/lock/lvm
 
+##############################################################################
+# Library and Development subpackages
+##############################################################################
+%package devel
+Summary: Development libraries and headers
+Group: Development/Libraries
+License: LGPLv2
+Requires: %{name} = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
+Requires: pkgconfig
+
+%description devel
+This package contains files needed to develop applications that use
+the lvm2 libraries.
+
+%files devel
+%defattr(-,root,root,-)
+%attr(755,root,root) /%{_lib}/liblvm2app.so
+%attr(755,root,root) /%{_lib}/liblvm2cmd.so
+%{_includedir}/lvm2app.h
+%{_includedir}/lvm2cmd.h
+/usr%{_libdir}/pkgconfig/liblvm2app.pc
+
+%package libs
+Summary: lvm2 shared libraries
+License: LGPLv2
+Group: System Environment/Libraries
+
+%description libs
+This package contains shared lvm2 libraries for applications.
+
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
+%files libs
+%attr(755,root,root) /%{_lib}/liblvm2app.so.*
+%attr(755,root,root) /%{_lib}/liblvm2cmd.so.*
+
 ##############################################################################
 # Cluster subpackage
 ##############################################################################
@@ -244,7 +284,7 @@ the device-mapper libraries.
 %defattr(-,root,root,-)
 %attr(755,root,root) /%{_lib}/libdevmapper.so
 %{_includedir}/libdevmapper.h
-/usr%{_libdir}/pkgconfig/*.pc
+/usr%{_libdir}/pkgconfig/devmapper.pc
 
 %package -n device-mapper-libs
 Summary: Device-mapper shared library
@@ -266,6 +306,18 @@ This package contains the device-mapper shared library, libdevmapper.
 
 
 %changelog
+* Tue Jul 28 2009 Alasdair Kergon <agk@redhat.com> - 2.02.50-1
+- Add libs and devel subpackages to include shared libraries for applications.
+  N.B. The liblvm2app API is not frozen yet and may still be changed
+  Send any feedback to the mailing list lvm-devel@redhat.com.
+- Remove obsolete --with-dmdir from configure.
+- Add global/wait_for_locks to lvm.conf so blocking for locks can be disabled.
+- Fix race condition with vgcreate and vgextend on same device since 2.02.49.
+- Add an API version number, LVM_LIBAPI, to the VERSION string.
+- Return EINVALID_CMD_LINE not success when invalid VG name format is used.
+- Remove unnecessary messages after vgcreate/vgsplit code change in 2.02.49.
+- Store any errno and error messages issued while processing each command.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.02.49-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild