diff --git a/include/curl/curlbuild.h.dist b/include/curl/curlbuild.h.dist
index 7dbafbce838db61fc8d9e59608f86c088bf59b4a..74754deee0a79ecf4084c3375b829dc00772df08 100644
--- a/include/curl/curlbuild.h.dist
+++ b/include/curl/curlbuild.h.dist
@@ -239,6 +239,13 @@
 #    define CURL_SIZEOF_CURL_OFF_T 8
 #  endif
 
+#elif defined(__MWERKS__)
+#  define CURL_OFF_T             long long
+#  define CURL_FMT_OFF_T         "lld"
+#  define CURL_FMT_OFF_TU        "llu"
+#  define CURL_FORMAT_OFF_T      "%lld"
+#  define CURL_SIZEOF_CURL_OFF_T 8
+
 #elif defined(_WIN32_WCE)
 #  define CURL_OFF_T             signed __int64
 #  define CURL_FMT_OFF_T         "I64d"
@@ -338,6 +345,25 @@
 #    endif
 #  endif
 
+/* ===================================== */
+/*    KEEP GENERIC GCC THE LAST ENTRY    */
+/* ===================================== */
+
+#elif defined(__GNUC__)
+#  if defined(__i386__)
+#    define CURL_OFF_T             long long
+#    define CURL_FMT_OFF_T         "lld"
+#    define CURL_FMT_OFF_TU        "llu"
+#    define CURL_FORMAT_OFF_T      "%lld"
+#    define CURL_SIZEOF_CURL_OFF_T 8
+#  elif defined(__x86_64__)
+#    define CURL_OFF_T             long
+#    define CURL_FMT_OFF_T         "ld"
+#    define CURL_FMT_OFF_TU        "lu"
+#    define CURL_FORMAT_OFF_T      "%ld"
+#    define CURL_SIZEOF_CURL_OFF_T 8
+#  endif
+
 #else
 #  error "Unknown non-configure build target!"
    Error Compilation_aborted_Unknown_non_configure_build_target