diff --git a/.cvsignore b/.cvsignore
index fc85fad..64abe4c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libmicrohttpd-0.3.1.tar.gz
+libmicrohttpd-0.4.0.tar.gz
diff --git a/libmicrohttpd.spec b/libmicrohttpd.spec
index 4442728..f7847ae 100644
--- a/libmicrohttpd.spec
+++ b/libmicrohttpd.spec
@@ -1,21 +1,10 @@
 Summary: Lightweight library for embedding a webserver in applications
 Name: libmicrohttpd
-Version: 0.3.1
-Release: 3%{?dist}
+Version: 0.4.0
+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/
@@ -121,6 +110,14 @@ fi
 %doc html
 
 %changelog
+* Fri Feb 13 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+
+
 * 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..2ed1355 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ae335b1f6f51488f2db3f216f71c852c  libmicrohttpd-0.3.1.tar.gz
+2e53f7b9c11474857756a72ccc29a91b  libmicrohttpd-0.4.0.tar.gz