diff --git a/cmdutils.c b/cmdutils.c
index 7012d04cc5b6167d449471f383ace7ab3e1ae4a0..1e7aacf00dfc8e2458319d226ff11eb5a88a9811 100644
--- a/cmdutils.c
+++ b/cmdutils.c
@@ -423,7 +423,7 @@ static void print_all_libs_info(FILE* outstream, int flags)
 
 void show_banner(void)
 {
-    fprintf(stderr, "%s version " FFMPEG_VERSION ", Copyright (c) %d-%d the FFmpeg developers\n",
+    fprintf(stderr, "%s version " LIBAV_VERSION ", Copyright (c) %d-%d the Libav developers\n",
             program_name, program_birth_year, this_year);
     fprintf(stderr, "  built on %s %s with %s %s\n",
             __DATE__, __TIME__, CC_TYPE, CC_VERSION);
@@ -433,7 +433,7 @@ void show_banner(void)
 }
 
 void show_version(void) {
-    printf("%s " FFMPEG_VERSION "\n", program_name);
+    printf("%s " LIBAV_VERSION "\n", program_name);
     print_all_libs_info(stdout, SHOW_VERSION);
 }
 
diff --git a/configure b/configure
index 3dba45229cc7e8e577513c5fe4de7adf5dcfd6b5..27d09f66cf40abf395ce33970b6718d6926d8800 100755
--- a/configure
+++ b/configure
@@ -3298,7 +3298,7 @@ cat > $TMPH <<EOF
 #ifndef LIBAV_CONFIG_H
 #define LIBAV_CONFIG_H
 #define LIBAV_CONFIGURATION "$(c_escape $LIBAV_CONFIGURATION)"
-#define FFMPEG_LICENSE "$(c_escape $license)"
+#define LIBAV_LICENSE "$(c_escape $license)"
 #define FFMPEG_DATADIR "$(eval c_escape $datadir)"
 #define CC_TYPE "$cc_type"
 #define CC_VERSION $cc_version
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index be9c912560d1bb64d3442a167f1e33904c4c8f98..13e58a219d8ff9105dd6d836bb25f01bd7a5b8c6 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -1041,7 +1041,7 @@ const char *avcodec_configuration(void)
 const char *avcodec_license(void)
 {
 #define LICENSE_PREFIX "libavcodec license: "
-    return LICENSE_PREFIX FFMPEG_LICENSE + sizeof(LICENSE_PREFIX) - 1;
+    return LICENSE_PREFIX LIBAV_LICENSE + sizeof(LICENSE_PREFIX) - 1;
 }
 
 void avcodec_init(void)
diff --git a/libavdevice/avdevice.c b/libavdevice/avdevice.c
index 01db8776ac46a6345a5d2bb3d4fb7c7f7abb6e4e..6c363feaa444b1723fbd15582b0025c3b82cea9f 100644
--- a/libavdevice/avdevice.c
+++ b/libavdevice/avdevice.c
@@ -31,5 +31,5 @@ const char * avdevice_configuration(void)
 const char * avdevice_license(void)
 {
 #define LICENSE_PREFIX "libavdevice license: "
-    return LICENSE_PREFIX FFMPEG_LICENSE + sizeof(LICENSE_PREFIX) - 1;
+    return LICENSE_PREFIX LIBAV_LICENSE + sizeof(LICENSE_PREFIX) - 1;
 }
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index c0ead5c4beb941dea30cc81d6d059298009d9c01..a46bc53d6ae781639354e2d3a3dc62d0eae37ba6 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -40,7 +40,7 @@ const char *avfilter_configuration(void)
 const char *avfilter_license(void)
 {
 #define LICENSE_PREFIX "libavfilter license: "
-    return LICENSE_PREFIX FFMPEG_LICENSE + sizeof(LICENSE_PREFIX) - 1;
+    return LICENSE_PREFIX LIBAV_LICENSE + sizeof(LICENSE_PREFIX) - 1;
 }
 
 AVFilterBufferRef *avfilter_ref_buffer(AVFilterBufferRef *ref, int pmask)
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 2f1db445729e083e4e6af39d3f878be67d9ed9a5..b1c97556469936f88124626bf94d0d6e4cba5bea 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -57,7 +57,7 @@ const char *avformat_configuration(void)
 const char *avformat_license(void)
 {
 #define LICENSE_PREFIX "libavformat license: "
-    return LICENSE_PREFIX FFMPEG_LICENSE + sizeof(LICENSE_PREFIX) - 1;
+    return LICENSE_PREFIX LIBAV_LICENSE + sizeof(LICENSE_PREFIX) - 1;
 }
 
 /* fraction handling */
diff --git a/libavutil/utils.c b/libavutil/utils.c
index 488bac4cc3d86d3cbf69452e7f73058a821b98b7..52152f5af3dc16c9e0cdc917fad21f8e1dca831d 100644
--- a/libavutil/utils.c
+++ b/libavutil/utils.c
@@ -37,5 +37,5 @@ const char *avutil_configuration(void)
 const char *avutil_license(void)
 {
 #define LICENSE_PREFIX "libavutil license: "
-    return LICENSE_PREFIX FFMPEG_LICENSE + sizeof(LICENSE_PREFIX) - 1;
+    return LICENSE_PREFIX LIBAV_LICENSE + sizeof(LICENSE_PREFIX) - 1;
 }
diff --git a/libpostproc/postprocess.c b/libpostproc/postprocess.c
index 7466b18be33e0af3cc205b19cd0540ecb8d87f9d..6834dd723dcf8c44383e7d2b0b97682c4fcc3a13 100644
--- a/libpostproc/postprocess.c
+++ b/libpostproc/postprocess.c
@@ -100,7 +100,7 @@ const char *postproc_configuration(void)
 const char *postproc_license(void)
 {
 #define LICENSE_PREFIX "libpostproc license: "
-    return LICENSE_PREFIX FFMPEG_LICENSE + sizeof(LICENSE_PREFIX) - 1;
+    return LICENSE_PREFIX LIBAV_LICENSE + sizeof(LICENSE_PREFIX) - 1;
 }
 
 #if HAVE_ALTIVEC_H
diff --git a/libswscale/utils.c b/libswscale/utils.c
index 34988a0c66c57fe3ffd3af8d9481273739e60b8a..1570297258259900a72af5dd8f71d99b44d3fe67 100644
--- a/libswscale/utils.c
+++ b/libswscale/utils.c
@@ -59,7 +59,7 @@ const char *swscale_configuration(void)
 const char *swscale_license(void)
 {
 #define LICENSE_PREFIX "libswscale license: "
-    return LICENSE_PREFIX FFMPEG_LICENSE + sizeof(LICENSE_PREFIX) - 1;
+    return LICENSE_PREFIX LIBAV_LICENSE + sizeof(LICENSE_PREFIX) - 1;
 }
 
 #define RET 0xC3 //near return opcode for x86
diff --git a/version.sh b/version.sh
index b34ee2c88ca263a7098da3e3ae47a86c6e72d4ca..66a1c6f0ac17412ff013f0ee3be68b31d94d8194 100755
--- a/version.sh
+++ b/version.sh
@@ -23,7 +23,7 @@ if [ -z "$2" ]; then
     exit
 fi
 
-NEW_REVISION="#define FFMPEG_VERSION \"$version\""
+NEW_REVISION="#define LIBAV_VERSION \"$version\""
 OLD_REVISION=$(cat version.h 2> /dev/null)
 
 # Update version.h only on revision changes to avoid spurious rebuilds