diff --git a/TODO-RELEASE b/TODO-RELEASE
index 5e0bb1f1296826c55f71e4aca731d8eafb5eae2f..ca90e76262662a88cd4eeb17f80c9191803281f1 100644
--- a/TODO-RELEASE
+++ b/TODO-RELEASE
@@ -9,10 +9,6 @@ To be addressed in 7.19.5 (planned release: May 2009)
 
 228 - rpath problems in linking with custom openssl
 
-231 - [PATCH] TPF-platform specific changes to various files
-      - committed with minor changes
-      - awaiting feedback
-
 232 - [PATCH] transfer.c fixes for CURL_DO_LINEEND_CONV and non-ASCII 
       platform HTTP requests
 
diff --git a/ares/ares_build.h.dist b/ares/ares_build.h.dist
index 77f13286bf7fe6add007f4258260f327c6e20614..6505aec3e5c12e26012b850f2c46377331e2c8c0 100644
--- a/ares/ares_build.h.dist
+++ b/ares/ares_build.h.dist
@@ -198,8 +198,8 @@
 
 #elif defined(TPF)
 #  define CARES_SIZEOF_LONG           8
-#  define CARES_TYPEOF_ARES_SOCKLEN_T FIXME
-#  define CARES_SIZEOF_ARES_SOCKLEN_T -1
+#  define CARES_TYPEOF_ARES_SOCKLEN_T int
+#  define CARES_SIZEOF_ARES_SOCKLEN_T 4
 
 /* ===================================== */
 /*    KEEP MSVC THE PENULTIMATE ENTRY    */
diff --git a/include/curl/curlbuild.h.dist b/include/curl/curlbuild.h.dist
index f606790065a8a86f1ecaae464f31424dd974f757..20fdef8acdda481398ad9064d5d67aebf10cd884 100644
--- a/include/curl/curlbuild.h.dist
+++ b/include/curl/curlbuild.h.dist
@@ -487,8 +487,8 @@
 #  define CURL_SIZEOF_CURL_OFF_T     8
 #  define CURL_SUFFIX_CURL_OFF_T     L
 #  define CURL_SUFFIX_CURL_OFF_TU    UL
-#  define CURL_TYPEOF_CURL_SOCKLEN_T FIXME
-#  define CURL_SIZEOF_CURL_SOCKLEN_T -1
+#  define CURL_TYPEOF_CURL_SOCKLEN_T int
+#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
 
 /* ===================================== */
 /*    KEEP MSVC THE PENULTIMATE ENTRY    */