diff --git a/redis.conf b/redis.conf
index 12eace525875be15295d6c4cd8f580dea86f1dd8..f5b7d5fed8b741d939c9dfe0320dcffe0def33b2 100644
--- a/redis.conf
+++ b/redis.conf
@@ -778,10 +778,7 @@ aof-load-truncated yes
 # When loading Redis recognizes that the AOF file starts with the "REDIS"
 # string and loads the prefixed RDB file, and continues loading the AOF
 # tail.
-#
-# This is currently turned off by default in order to avoid the surprise
-# of a format change, but will at some point be used as the default.
-aof-use-rdb-preamble no
+aof-use-rdb-preamble yes
 
 ################################ LUA SCRIPTING  ###############################
 
diff --git a/src/server.h b/src/server.h
index 023839e33da1b484fd9b9a92f7ff4f57a0b3f24b..1559375361033ad55a330813614f87d702360a56 100644
--- a/src/server.h
+++ b/src/server.h
@@ -139,7 +139,7 @@ typedef long long mstime_t; /* millisecond time type. */
 #define CONFIG_DEFAULT_AOF_FILENAME "appendonly.aof"
 #define CONFIG_DEFAULT_AOF_NO_FSYNC_ON_REWRITE 0
 #define CONFIG_DEFAULT_AOF_LOAD_TRUNCATED 1
-#define CONFIG_DEFAULT_AOF_USE_RDB_PREAMBLE 0
+#define CONFIG_DEFAULT_AOF_USE_RDB_PREAMBLE 1
 #define CONFIG_DEFAULT_ACTIVE_REHASHING 1
 #define CONFIG_DEFAULT_AOF_REWRITE_INCREMENTAL_FSYNC 1
 #define CONFIG_DEFAULT_MIN_SLAVES_TO_WRITE 0