diff --git a/.cvsignore b/.cvsignore
index e6c0eb5..693cb40 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
-compface-1.4.tar.gz
+compface-1.5.2.tar.gz
+libcompface_1.5.2-3.diff.gz
diff --git a/compface-1.4.lsm b/compface-1.4.lsm
deleted file mode 100644
index 19f1270..0000000
--- a/compface-1.4.lsm
+++ /dev/null
@@ -1,20 +0,0 @@
-Begin3
-Title:          compface          
-Version:        1.4
-Entered-date:   23NOV00
-Description:    Routines for converting between X-Face format and Bitblit
-		ikon format. Uncompface also generates X bitmap format
-		directly with -X flag. Shenghuo ZHU <zsh@cs.rochester.edu>
-		added GNU configure and made xbitmap variable less public.
-		-X didn't work in 1.2, should work in 1.3 now.
-		Should also compile on systems with only strerror() in 1.4.
-Keywords:       faces, picons, exmh
-Author:         jaa@cs.su.oz.au (James Ashton)
-Maintained-by:  ken_yap@users.sourceforge.net (Ken Yap)
-Primary-site:   www.ibiblio.org /pub/Linux/apps/graphics/convert
-		29154 compface-1.4.tar.gz
-                825 compface-1.4.lsm
-Original-site:  ftp://ftp.cs.indiana.edu/pub/faces/compface/
-Platforms:      Unix
-Copying-policy: MIT
-End
diff --git a/compface-1.5.2-build.patch b/compface-1.5.2-build.patch
new file mode 100644
index 0000000..ab47cef
--- /dev/null
+++ b/compface-1.5.2-build.patch
@@ -0,0 +1,81 @@
+o Build shared library, link tools against it
+o Make it possible to prevent stripping
+o Add DESTDIR support
+
+--- Makefile.in~	2005-10-04 15:59:49.000000000 +0300
++++ Makefile.in	2006-08-02 22:23:07.000000000 +0300
+@@ -15,6 +15,7 @@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_DATA    = @INSTALL_DATA@
+ SHELL           = /bin/sh
++STRIP           = strip
+ 
+ NAME		= compface
+ UNNAME		= uncompface
+@@ -25,6 +26,7 @@
+ UNEXECUTABLE	= $(BINDIR)/$(UNNAMEEXE)
+ LIBNAME		= lib$(NAME).a
+ LIBRARY		= $(LIBDIR)/$(LIBNAME)
++SHLIBNAME	= lib$(NAME).so
+ MAN1DIR		= $(MANDIR)/man1
+ MAN3DIR		= $(MANDIR)/man3
+ OBJECTS		= arith.o file.o compress.o gen.o uncompface.o
+@@ -45,11 +47,11 @@
+ 
+ all:		$(NAMEEXE) $(UNNAMEEXE)
+ 
+-$(NAMEEXE) :	cmain.o compface.o $(LIBNAME)
+-		$(CC) $(LDFLAGS) -o $@ cmain.o compface.o $(LIBNAME)
++$(NAMEEXE) :	cmain.o compface.o $(SHLIBNAME)
++		$(CC) $(LDFLAGS) -o $@ cmain.o compface.o -L. -l$(NAME)
+ 
+-$(UNNAMEEXE) :	uncmain.o $(LIBNAME)
+-		$(CC) $(LDFLAGS) -o $@ uncmain.o $(LIBNAME)
++$(UNNAMEEXE) :	uncmain.o $(SHLIBNAME)
++		$(CC) $(LDFLAGS) -o $@ uncmain.o -L. -l$(NAME)
+ 
+ $(LIBNAME) :	$(OBJECTS)
+ 		ar rc $(LIBNAME) $(OBJECTS)
+@@ -73,25 +75,28 @@
+ 		tar chzf `cat .fname`.tar.gz `cat .fname`
+ 		$(RM) -rf `cat .fname` .fname
+ 
+-install: 	$(NAMEEXE) $(UNNAMEEXE) $(LIBNAME)
+-		$(INSTALL_PROGRAM) -d $(BINDIR) $(LIBDIR) $(MAN1DIR) $(MAN3DIR) $(INCLUDEDIR)
+-		$(INSTALL_PROGRAM) $(srcdir)/$(NAMEEXE) $(EXECUTABLE) 
+-		-chmod 0755 $(EXECUTABLE)
+-		-strip $(EXECUTABLE)
+-		$(INSTALL_PROGRAM) $(srcdir)/$(UNNAMEEXE) $(UNEXECUTABLE)
+-		-chmod 0755 $(UNEXECUTABLE)
+-		-strip $(UNEXECUTABLE)
+-		$(INSTALL_DATA) $(srcdir)/$(NAME).1 $(MAN1DIR)/$(NAME).1
+-		cd $(MAN1DIR) && $(RM) ./$(UNNAME).1 && $(LN_S) $(NAME).1 $(UNNAME).1
+-		$(INSTALL_DATA) $(srcdir)/$(NAME).3 $(MAN3DIR)/$(NAME).3
+-		cd $(MAN3DIR) && $(RM) ./$(UNNAME).3 && $(LN_S) $(NAME).3 $(UNNAME).3
+-		for hdr in $(INSTALLHEADERS); do $(INSTALL_DATA) $(srcdir)/$${hdr} $(INCLUDEDIR)/$${hdr}; done
+-		$(INSTALL_DATA) $(srcdir)/$(LIBNAME) $(LIBRARY)
++install: 	$(NAMEEXE) $(UNNAMEEXE) $(SHLIBNAME)
++		$(INSTALL_PROGRAM) -d $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(MAN1DIR) $(DESTDIR)$(MAN3DIR) $(DESTDIR)$(INCLUDEDIR)
++		$(INSTALL_PROGRAM) $(srcdir)/$(NAMEEXE) $(DESTDIR)$(EXECUTABLE) 
++		-$(STRIP) $(DESTDIR)$(EXECUTABLE)
++		$(INSTALL_PROGRAM) $(srcdir)/$(UNNAMEEXE) $(DESTDIR)$(UNEXECUTABLE)
++		-$(STRIP) $(DESTDIR)$(UNEXECUTABLE)
++		$(INSTALL_DATA) $(srcdir)/$(NAME).1 $(DESTDIR)$(MAN1DIR)/$(NAME).1
++		cd $(DESTDIR)$(MAN1DIR) && $(RM) ./$(UNNAME).1 && $(LN_S) $(NAME).1 $(UNNAME).1
++		$(INSTALL_DATA) $(srcdir)/$(NAME).3 $(DESTDIR)$(MAN3DIR)/$(NAME).3
++		cd $(DESTDIR)$(MAN3DIR) && $(RM) ./$(UNNAME).3 && $(LN_S) $(NAME).3 $(UNNAME).3
++		for hdr in $(INSTALLHEADERS); do $(INSTALL_DATA) $(srcdir)/$${hdr} $(DESTDIR)$(INCLUDEDIR)/$${hdr}; done
++		$(INSTALL_PROGRAM) $(srcdir)/$(SHLIBNAME) $(DESTDIR)$(LIBDIR)/$(SHLIBNAME).1.0.0
++		$(LN_S) $(SHLIBNAME).1.0.0 $(DESTDIR)$(LIBDIR)/$(SHLIBNAME).1
++		$(LN_S) $(SHLIBNAME).1 $(DESTDIR)$(LIBDIR)/$(SHLIBNAME)
+ 
+ shar :
+ 		shar.script $(OTHERS) $(HDRS) $(SOURCES) > $(NAME).sh
+ 		compress $(NAME).sh
+ 
++$(SHLIBNAME): $(OBJECTS)
++	$(CC) -shared -Wl,-soname,$(SHLIBNAME).1 $(LDFLAGS) -o $(SHLIBNAME) $(OBJECTS)
++
+ .c.o:
+ 	$(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
+ 
diff --git a/compface-errno.patch b/compface-errno.patch
deleted file mode 100644
index 14f8406..0000000
--- a/compface-errno.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- compface.h~	2000-11-22 15:38:39.000000000 +0200
-+++ compface.h	2003-05-03 15:06:19.000000000 +0300
-@@ -17,6 +17,7 @@
- #define COMPFACE_H
- 
- #include <setjmp.h>
-+#include <errno.h>
- 
- /* For all function declarations, if ANSI then use a prototype. */
- 
diff --git a/compface-nostrip.patch b/compface-nostrip.patch
deleted file mode 100644
index d3d5920..0000000
--- a/compface-nostrip.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- Makefile.in~	2000-11-22 15:38:39.000000000 +0200
-+++ Makefile.in	2004-12-17 02:04:55.304563553 +0200
-@@ -75,6 +75,4 @@
- 		-chmod 0755 $(EXECUTABLE)
--		-strip $(EXECUTABLE)
- 		$(INSTALL_PROGRAM) $(srcdir)/$(UNNAME) $(UNEXECUTABLE)
- 		-chmod 0755 $(UNEXECUTABLE)
--		-strip $(UNEXECUTABLE)
- 		$(INSTALL_DATA) $(srcdir)/$(NAME).1 $(MAN1DIR)/$(NAME).1
diff --git a/compface.spec b/compface.spec
index 8e0cd55..b068507 100644
--- a/compface.spec
+++ b/compface.spec
@@ -1,61 +1,76 @@
 Name:           compface
-Version:        1.4
-Release:        7%{?dist}
-Summary:        Library for handling X-Faces
+Version:        1.5.2
+Release:        1%{?dist}
+Summary:        Utilities for handling X-Faces
 
-Group:          System Environment/Libraries
+Group:          Applications/Multimedia
 License:        MIT
 URL:            http://www.ibiblio.org/pub/Linux/apps/graphics/convert/
-Source0:        ftp://ftp.ibiblio.org/pub/Linux/apps/graphics/convert/compface-1.4.tar.gz
-Source1:        ftp://ftp.ibiblio.org/pub/Linux/apps/graphics/convert/compface-1.4.lsm
-Patch0:         %{name}-errno.patch
-Patch1:         %{name}-nostrip.patch
+Source0:        http://ftp.xemacs.org/pub/xemacs/aux/%{name}-%{version}.tar.gz
+Patch0:         http://ftp.debian.org/debian/pool/main/libc/libcompface/libcompface_1.5.2-3.diff.gz
+Patch1:         %{name}-1.5.2-build.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Provides:       %{name}-devel = %{version}-%{release}
-
 %description
-Library for handling X-Faces and Bitblit icons.
+%{summary}.
+
+%package        devel
+Summary:        Library for handling X-Faces
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+
+%description    devel
+%{summary}.
 
 
 %prep
 %setup -q
-install -pm 644 %{SOURCE1} .
-%patch0 -p0
+%patch0 -p1
 %patch1 -p0
 
 
 %build
-%configure
+CFLAGS="$RPM_OPT_FLAGS -fPIC" %configure
 make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p \
-  $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man{1,3},%{_includedir},%{_libdir}}
-%makeinstall \
-  BINDIR=$RPM_BUILD_ROOT%{_bindir} \
-  LIBDIR=$RPM_BUILD_ROOT%{_libdir} \
-  MANDIR=$RPM_BUILD_ROOT%{_mandir} \
-  INCLUDEDIR=$RPM_BUILD_ROOT%{_includedir}
+make install DESTDIR=$RPM_BUILD_ROOT STRIP=/bin/true
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog README *.lsm
-%{_bindir}/*compface
-%{_libdir}/libcompface.a
+%doc ChangeLog README xbm2xface.pl
+%{_bindir}/compface
+%{_bindir}/uncompface
+%{_libdir}/libcompface.so.*
+%{_mandir}/man1/compface.1*
+%{_mandir}/man1/uncompface.1*
+
+%files devel
+%defattr(-,root,root,-)
 %{_includedir}/compface.h
-%{_mandir}/man1/*compface.1*
-%{_mandir}/man3/*compface.3*
+%{_libdir}/libcompface.so
+%{_mandir}/man3/compface.3*
+%{_mandir}/man3/uncompface.3*
 
 
 %changelog
+* Wed Aug  2 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.5.2-1
+- Update to 1.5.2, apply Debian's 1.5.2-3 patchset.
+- Crudely patch to build a shared lib (inspired by Debian), drop static one.
+- Split -devel subpackage.
+
 * Mon Jul 31 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.4-7
 - Ensure proper doc file permissions.
 
diff --git a/sources b/sources
index 19b2d6c..1852446 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-c45b54f67cc5d3580a18e4113219bc26  compface-1.4.tar.gz
+62f4f79c0861ad292ba3cf77b4c48319  compface-1.5.2.tar.gz
+330b8a78bf18d8cb46b3c23252f6ff9b  libcompface_1.5.2-3.diff.gz