diff --git a/.cvsignore b/.cvsignore
index ca63da7..a48a019 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -5,3 +5,4 @@ libevent-1.3e.tar.gz
 libevent-1.4.4-stable.tar.gz
 libevent-1.4.5-stable.tar.gz
 libevent-1.4.10-stable.tar.gz
+libevent-1.4.12-stable.tar.gz
diff --git a/libevent-1.4.12-stable-configure.patch b/libevent-1.4.12-stable-configure.patch
new file mode 100644
index 0000000..31d7283
--- /dev/null
+++ b/libevent-1.4.12-stable-configure.patch
@@ -0,0 +1,22 @@
+diff -up libevent-1.4.12-stable/configure.in.orig libevent-1.4.12-stable/configure.in
+--- libevent-1.4.12-stable/configure.in.orig	2009-07-24 22:16:55.000000000 -0400
++++ libevent-1.4.12-stable/configure.in	2009-08-18 15:54:26.925112000 -0400
+@@ -138,8 +138,6 @@ AC_HEADER_TIME
+ dnl Checks for library functions.
+ AC_CHECK_FUNCS(gettimeofday vasprintf fcntl clock_gettime strtok_r strsep getaddrinfo getnameinfo strlcpy inet_ntop signal sigaction strtoll)
+ 
+-AC_CHECK_SIZEOF(long)
+-
+ if test "x$ac_cv_func_clock_gettime" = "xyes"; then
+    AC_DEFINE(DNS_USE_CPU_CLOCK_FOR_ID, 1, [Define if clock_gettime is available in libc])
+ else
+@@ -309,9 +307,6 @@ AC_CHECK_TYPES([uint64_t, uint32_t, uint
+ #ifdef HAVE_SYS_TYPES_H
+ #include <sys/types.h>
+ #endif])
+-AC_CHECK_SIZEOF(long long)
+-AC_CHECK_SIZEOF(int)
+-AC_CHECK_SIZEOF(short)
+ AC_CHECK_TYPES([struct in6_addr], , ,
+ [#ifdef WIN32
+ #include <winsock2.h>
diff --git a/libevent-1.4.12-stable-epoll.patch b/libevent-1.4.12-stable-epoll.patch
new file mode 100644
index 0000000..a43abbe
--- /dev/null
+++ b/libevent-1.4.12-stable-epoll.patch
@@ -0,0 +1,19 @@
+diff -up libevent-1.4.12-stable/epoll.c.orig libevent-1.4.12-stable/epoll.c
+--- libevent-1.4.12-stable/epoll.c.orig	2009-07-02 02:05:28.000000000 -0400
++++ libevent-1.4.12-stable/epoll.c	2009-08-18 16:13:31.672097000 -0400
+@@ -115,6 +115,7 @@ epoll_init(struct event_base *base)
+ 	if (getenv("EVENT_NOEPOLL"))
+ 		return (NULL);
+ 
++#ifndef linux
+ 	if (getrlimit(RLIMIT_NOFILE, &rl) == 0 &&
+ 	    rl.rlim_cur != RLIM_INFINITY) {
+ 		/*
+@@ -124,6 +125,7 @@ epoll_init(struct event_base *base)
+ 		 */
+ 		nfiles = rl.rlim_cur - 1;
+ 	}
++#endif
+ 
+ 	/* Initalize the kernel queue */
+ 
diff --git a/libevent.spec b/libevent.spec
index fc7e611..55eaa76 100644
--- a/libevent.spec
+++ b/libevent.spec
@@ -1,6 +1,6 @@
 Name:           libevent
-Version:        1.4.10
-Release:        2%{?dist}
+Version:        1.4.12
+Release:        1%{?dist}
 Summary:        Abstract asynchronous event notification library
 
 Group:          System Environment/Libraries
@@ -9,6 +9,9 @@ URL:            http://monkey.org/~provos/libevent/
 Source0:        http://monkey.org/~provos/libevent-%{version}-stable.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch00: libevent-1.4.12-stable-configure.patch
+Patch01: libevent-1.4.12-stable-epoll.patch
+
 %description
 The libevent API provides a mechanism to execute a callback function
 when a specific event occurs on a file descriptor or after a timeout
@@ -31,16 +34,40 @@ you will need to install %{name}-devel.
 %prep
 %setup -q -n libevent-%{version}-stable
 
+# 477685 -  libevent-devel multilib conflict
+%patch00 -p1
+# 517918 -  epoll backend allocates too much memory
+%patch01 -p1
+
 %build
 %configure \
     --disable-dependency-tracking
 make %{?_smp_mflags}
 
+# Create the docs
+make doxygen
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
+mkdir -p $RPM_BUILD_ROOT/%{_docdir}/%{name}-devel-%{version}/html
+(cd doxygen/html; \
+	install *.* $RPM_BUILD_ROOT/%{_docdir}/%{name}-devel-%{version}/html)
+
+mkdir -p $RPM_BUILD_ROOT/%{_docdir}/%{name}-devel-%{version}/latex
+(cd doxygen/latex; \
+	install *.* $RPM_BUILD_ROOT/%{_docdir}/%{name}-devel-%{version}/latex)
+
+mkdir -p $RPM_BUILD_ROOT/%{_docdir}/%{name}-devel-%{version}/man/man3
+(cd doxygen/man/man3; \
+	install *.3 $RPM_BUILD_ROOT/%{_docdir}/%{name}-devel-%{version}/man/man3)
+
+mkdir -p $RPM_BUILD_ROOT/%{_docdir}/%{name}-devel-%{version}/sample
+(cd sample; \
+	install *.c Makefile* $RPM_BUILD_ROOT/%{_docdir}/%{name}-devel-%{version}/sample)
+
 %check
 make verify
 
@@ -60,7 +87,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root,0755)
-%doc sample/*.c
 %{_includedir}/event.h
 %{_includedir}/evdns.h
 %{_includedir}/evhttp.h
@@ -78,7 +104,18 @@ rm -rf $RPM_BUILD_ROOT
 
 %{_mandir}/man3/*
 
+%{_docdir}/%{name}-devel-%{version}/html/*
+%{_docdir}/%{name}-devel-%{version}/latex/*
+%{_docdir}/%{name}-devel-%{version}/man/man3/*
+%{_docdir}/%{name}-devel-%{version}/sample/*
+
 %changelog
+* Tue Aug 18 2009 Steve Dickson <steved@redhat.com> 1.4.12-1
+- Updated to latest stable upstream version: 1.4.12
+- API documentation is now installed (bz 487977)
+- libevent-devel multilib conflict (bz 477685)
+- epoll backend allocates too much memory (bz 517918)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.10-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/sources b/sources
index 92ad9bb..af43ad6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-20611535f26d415bd6ad380a673d9ea2  libevent-1.4.10-stable.tar.gz
+77b0d8b9885496871bb083165b35ba11  libevent-1.4.12-stable.tar.gz