diff --git a/ChangeLog b/ChangeLog
index e3afb191c..e3dba17dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,7 @@ Features
     to override the whole module.
 
 API Changes
+   * Configuration options POLARSSL_HAVE_LONGLONG was removed (now always on).
    * Configuration options POLARSSL_HAVE_INT8 and POLARSSL_HAVE_INT16 have
      been removed (compiler is required to support 32-bit operations).
    * Configuration option POLARSSL_HAVE_IPV6 was removed (always enabled).
diff --git a/configs/config-picocoin.h b/configs/config-picocoin.h
index c5f974c01..4f6f3e2da 100644
--- a/configs/config-picocoin.h
+++ b/configs/config-picocoin.h
@@ -13,7 +13,6 @@
 #define MBEDTLS_CONFIG_H
 
 /* System support */
-#define MBEDTLS_HAVE_LONGLONG
 #define MBEDTLS_HAVE_ASM
 #define MBEDTLS_HAVE_TIME
 
diff --git a/include/mbedtls/bignum.h b/include/mbedtls/bignum.h
index 68ac65b1d..88fc86ec2 100644
--- a/include/mbedtls/bignum.h
+++ b/include/mbedtls/bignum.h
@@ -138,15 +138,8 @@ typedef UINT64 uint64_t;
      #define MBEDTLS_HAVE_INT32
      typedef  int32_t mbedtls_mpi_sint;
      typedef uint32_t mbedtls_mpi_uint;
-     #if ( defined(_MSC_VER) && defined(_M_IX86) )
-       typedef uint64_t mbedtls_t_udbl;
-       #define MBEDTLS_HAVE_UDBL
-     #else
-       #if defined( MBEDTLS_HAVE_LONGLONG )
-         typedef unsigned long long mbedtls_t_udbl;
-         #define MBEDTLS_HAVE_UDBL
-       #endif
-     #endif
+     typedef uint64_t mbedtls_t_udbl;
+     #define MBEDTLS_HAVE_UDBL
   #endif /* !MBEDTLS_HAVE_INT32 && __GNUC__ && 64-bit platform */
 #endif /* !MBEDTLS_HAVE_INT32 && _MSC_VER && _M_AMD64 */
 
diff --git a/include/mbedtls/compat-1.3.h b/include/mbedtls/compat-1.3.h
index 7b8c3bf88..7b9831752 100644
--- a/include/mbedtls/compat-1.3.h
+++ b/include/mbedtls/compat-1.3.h
@@ -240,9 +240,6 @@
 #if defined MBEDTLS_HAVE_ASM
 #define POLARSSL_HAVE_ASM MBEDTLS_HAVE_ASM
 #endif
-#if defined MBEDTLS_HAVE_LONGLONG
-#define POLARSSL_HAVE_LONGLONG MBEDTLS_HAVE_LONGLONG
-#endif
 #if defined MBEDTLS_HAVE_SSE2
 #define POLARSSL_HAVE_SSE2 MBEDTLS_HAVE_SSE2
 #endif
diff --git a/include/mbedtls/config.h b/include/mbedtls/config.h
index 80e50f244..46cc7aeb6 100644
--- a/include/mbedtls/config.h
+++ b/include/mbedtls/config.h
@@ -39,14 +39,6 @@
  * \{
  */
 
-/**
- * \def MBEDTLS_HAVE_LONGLONG
- *
- * The compiler supports the 'long long' type.
- * (Only used on 32-bit platforms)
- */
-#define MBEDTLS_HAVE_LONGLONG
-
 /**
  * \def MBEDTLS_HAVE_ASM
  *
diff --git a/library/version_features.c b/library/version_features.c
index 855174ce3..de9c1bb8f 100644
--- a/library/version_features.c
+++ b/library/version_features.c
@@ -39,9 +39,6 @@
 
 static const char *features[] = {
 #if defined(MBEDTLS_VERSION_FEATURES)
-#if defined(MBEDTLS_HAVE_LONGLONG)
-    "MBEDTLS_HAVE_LONGLONG",
-#endif /* MBEDTLS_HAVE_LONGLONG */
 #if defined(MBEDTLS_HAVE_ASM)
     "MBEDTLS_HAVE_ASM",
 #endif /* MBEDTLS_HAVE_ASM */