diff --git a/.cvsignore b/.cvsignore
index fc85fad..ddf92ff 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libmicrohttpd-0.3.1.tar.gz
+libmicrohttpd-0.4.6.tar.gz
diff --git a/libmicrohttpd.spec b/libmicrohttpd.spec
index 4442728..fc520e0 100644
--- a/libmicrohttpd.spec
+++ b/libmicrohttpd.spec
@@ -1,24 +1,12 @@
 Summary: Lightweight library for embedding a webserver in applications
 Name: libmicrohttpd
-Version: 0.3.1
-Release: 3%{?dist}
+Version: 0.4.6
+Release: 1%{?dist}
 Group: Development/Libraries
-Source0: ftp://ftp.gnu.org/gnu/libmicrohttpd/%{name}-%{version}.tar.gz
-
-# This project was originally GPLv2+, but was changed later to LGPLv2+
-# http://crisp.cs.du.edu/pipermail/libmicrohttpd/2007/000001.html
-#
-# However, the 0.3.1 release contains pieces of code from opencdk (GPLv2+)
-# and openpgp (GPLv3+) which are linked in the library.
-# Thus, the resulting license should be GPLv3+
-#
-# Upstream has removed from GPL code from the SVN repository, but
-# no new release has been made yet, so for now the license is GPLv3+
-# and in the next release it will be changed to LGPLv2+
-License: GPLv3+
-
+License: LGPLv2+
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 URL: http://www.gnu.org/software/libmicrohttpd/
+Source0: ftp://ftp.gnu.org/gnu/libmicrohttpd/%{name}-%{version}.tar.gz
 
 BuildRequires:	libcurl-devel
 BuildRequires:	graphviz
@@ -53,6 +41,9 @@ Development files for libmicrohttpd
 Summary:	Documentation for libmicrohttpd
 Group:		Documentation
 Requires:	%{name} = %{version}-%{release}
+%if 0%{?fedora} >= 11
+BuildArch:	noarch
+%endif
 
 %description doc
 Doxygen documentation for libmicrohttpd and some example source code
@@ -66,7 +57,7 @@ unlink doc/Doxyfile
 mv tmp doc/Doxyfile
 
 %build
-%configure --disable-static
+%configure --disable-static --enable-messages --enable-https
 make %{?_smp_mflags}
 doxygen doc/Doxyfile
 
@@ -104,13 +95,14 @@ fi
 %files
 %defattr(-,root,root,-)
 %doc COPYING
-%{_libdir}/libmicrohttpd.so.4
-%{_libdir}/libmicrohttpd.so.4.0.3
+%{_libdir}/libmicrohttpd.so.5
+%{_libdir}/libmicrohttpd.so.5.2.1
 
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/microhttpd.h
 %{_libdir}/libmicrohttpd.so
+%{_libdir}/pkgconfig/libmicrohttpd.pc
 
 %files doc
 %defattr(-,root,root,-)
@@ -121,6 +113,36 @@ fi
 %doc html
 
 %changelog
+* Sun Jun  4 2010 Erik van Pienbroek <epienbro@fedoraproject.org> - 0.4.6-1
+- Update to 0.4.6
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Jul 21 2009 Erik van Pienbroek <epienbro@fedoraproject.org> - 0.4.2-1
+- Update to version 0.4.2
+- Drop upstreamed patch
+
+* Fri Feb 27 2009 Erik van Pienbroek <info@nntpgrab.nl> - 0.4.0a-1
+- Update to version 0.4.0a
+- Drop upstreamed patch
+- Added a new patch to fix a 64bit issue
+- The -devel package now contains a pkgconfig file
+- The configure script is now run with '--enable-messages --enable-https'
+- Made the -doc subpackage noarch (F11+)
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Feb 14 2009 Erik van Pienbroek <info@nntpgrab.nl> - 0.4.0-1
+- Update to version 0.4.0
+- This version introduces a API bump (which is required for
+  supporting large files on 32bit environments)
+- The license issues we had with version 0.3.1 of this package (as
+  discussed in #457924) are resolved in this version. The license
+  of this package is now changed to LGPLv2+
+- Added a patch to fix two testcases on 64bit environments (upstream bug #1454)
+
 * Sat Sep 6 2008 Erik van Pienbroek <info@nntpgrab.nl> - 0.3.1-3
 - Changed license to GPLv3+ and added some comments
   regarding the license issues with this package
diff --git a/sources b/sources
index 7ead5dd..b8cfe5f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ae335b1f6f51488f2db3f216f71c852c  libmicrohttpd-0.3.1.tar.gz
+61698da6aa04744ea076c327f66fc05a  libmicrohttpd-0.4.6.tar.gz