diff --git a/NEWS b/NEWS
index cab4cf12..190692f7 100644
--- a/NEWS
+++ b/NEWS
@@ -1,8 +1,17 @@
+ * The LENGTH argument to gpgme_data_new_from_filepart changed its
+   type from off_t to the unsigned size_t.
+
  * There is a Texinfo manual documenting the API.
 
  * New interface gpgme_op_trustlist_end() to match
    gpgme_op_keylist_end.
 
+ * Interface changes relative to the 0.3.0 release:
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+gpgme_data_new_from_filepart	CHANGED: Type of LENGTH is size_t.
+gpgme_op_trustlist_next		NEW
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
 Noteworthy changes in version 0.3.0 (2001-12-19)
 ------------------------------------------------
  
@@ -45,7 +54,7 @@ Noteworthy changes in version 0.3.0 (2001-12-19)
    uses the GnuPG engine (`gpgmeplug') and one module which uses the
    GpgSM engine (`gpgsmplug').
 
-* Interface changes relative to the latest 0.2.x release:
+ * Interface changes relative to the latest 0.2.x release:
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 gpgme_key_get_as_xml		CHANGED: Sub-user ids reversed in order.
 gpgme_key_get_string_attr	CHANGED: User ids reversed in order.
diff --git a/TODO b/TODO
index ff949281..27055a9e 100644
--- a/TODO
+++ b/TODO
@@ -1,6 +1,4 @@
 * ABI's to break:
-** gpgme_data_new_from_filepart takes an off_t as count, but should
-   take a size_t.
 ** GpgmePassphraseCb should have void **R_HD, not void *R_HD.
 ** trustlist has the same start/end problem as keylist had.
    In fact, all the _start functions have this problem!
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 1b28c8fb..2979e0ab 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-22  Marcus Brinkmann  <marcus@g10code.de>
+
+	* gpgme.texi (Creating data buffers): Change
+	gpgme_data_new_from_filepart's LENGTH type from off_t to size_t.
+
 2002-01-22  Marcus Brinkmann  <marcus@g10code.de>
 
 	* gpgme.texi (Generating keys): New subsection.
diff --git a/doc/gpgme.texi b/doc/gpgme.texi
index c4d66bbf..ddd9432e 100644
--- a/doc/gpgme.texi
+++ b/doc/gpgme.texi
@@ -724,7 +724,7 @@ I/O operation fails, @code{GPGME_Not_Implemented} if @var{code} is
 zero, and @code{GPGME_Out_Of_Core} if not enough memory is available.
 @end deftypefun
 
-@deftypefun GpgmeError gpgme_data_new_from_filepart (@w{GpgmeData *@var{dh}}, @w{const char *@var{filename}}, @w{FILE *@var{fp}}, @w{off_t @var{offset}}, @w{off_t @var{length}})
+@deftypefun GpgmeError gpgme_data_new_from_filepart (@w{GpgmeData *@var{dh}}, @w{const char *@var{filename}}, @w{FILE *@var{fp}}, @w{off_t @var{offset}}, @w{size_t @var{length}})
 The function @code{gpgme_data_new_from_filepart} creates a new
 @code{GpgmeData} object and fills it with a part of the file specified
 by @var{filename} or @var{fp}.
diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index 348b54c9..059fcaac 100644
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,3 +1,9 @@
+2002-01-22  Marcus Brinkmann  <marcus@g10code.de>
+
+	* data.c (gpgme_data_new_from_filepart): Change type of LENGTH
+	from off_t to size_t.
+	* gpgme.h: Likewise.
+
 2002-01-22  Marcus Brinkmann  <marcus@g10code.de>
 
 	* wait.c (_gpgme_wait_on_condition): If the process finished,
diff --git a/gpgme/data.c b/gpgme/data.c
index 9a8cce04..911be5c3 100644
--- a/gpgme/data.c
+++ b/gpgme/data.c
@@ -283,7 +283,7 @@ gpgme_data_new_from_file (GpgmeData *r_dh, const char *fname, int copy)
  **/
 GpgmeError
 gpgme_data_new_from_filepart (GpgmeData *r_dh, const char *fname, FILE *fp,
-			      off_t offset, off_t length)
+			      off_t offset, size_t length)
 {
   GpgmeData dh;
   GpgmeError err;
diff --git a/gpgme/gpgme.h b/gpgme/gpgme.h
index 178435ba..33ae45d0 100644
--- a/gpgme/gpgme.h
+++ b/gpgme/gpgme.h
@@ -218,9 +218,9 @@ GpgmeError    gpgme_data_new_with_read_cb ( GpgmeData *r_dh,
 GpgmeError    gpgme_data_new_from_file ( GpgmeData *r_dh,
                                          const char *fname,
                                          int copy );
-GpgmeError    gpgme_data_new_from_filepart ( GpgmeData *r_dh,
-                                             const char *fname, FILE *fp,
-                                             off_t offset, off_t length );
+GpgmeError gpgme_data_new_from_filepart (GpgmeData *r_dh,
+					 const char *fname, FILE *fp,
+					 off_t offset, size_t length);
 void          gpgme_data_release ( GpgmeData dh );
 char *        gpgme_data_release_and_get_mem ( GpgmeData dh, size_t *r_len );
 GpgmeDataType gpgme_data_get_type ( GpgmeData dh );