diff --git a/Changelog b/Changelog
index b098203fa5..4714ca791f 100644
--- a/Changelog
+++ b/Changelog
@@ -5,6 +5,8 @@ releases are sorted from youngest to oldest.
 version <next>:
 
 - Automatic thread count based on detection number of (available) CPU cores
+- Deprecate libpostproc. If desired, the switch --enable-postproc will
+  enable it but it may be removed in a later Libav release.
 
 
 version 0.8_beta1:
diff --git a/cmdutils.c b/cmdutils.c
index 1b8f1dd816..f2e3490286 100644
--- a/cmdutils.c
+++ b/cmdutils.c
@@ -33,7 +33,9 @@
 #include "libavfilter/avfilter.h"
 #include "libavdevice/avdevice.h"
 #include "libswscale/swscale.h"
+#if CONFIG_POSTPROC
 #include "libpostproc/postprocess.h"
+#endif
 #include "libavutil/avstring.h"
 #include "libavutil/mathematics.h"
 #include "libavutil/parseutils.h"
@@ -496,7 +498,9 @@ static void print_all_libs_info(int flags, int level)
     PRINT_LIB_INFO(avdevice, AVDEVICE, flags, level);
     PRINT_LIB_INFO(avfilter, AVFILTER, flags, level);
     PRINT_LIB_INFO(swscale,  SWSCALE,  flags, level);
+#if CONFIG_POSTPROC
     PRINT_LIB_INFO(postproc, POSTPROC, flags, level);
+#endif
 }
 
 void show_banner(void)
diff --git a/configure b/configure
index 9bf65d23cc..526aa77f9f 100755
--- a/configure
+++ b/configure
@@ -89,7 +89,7 @@ Configuration options:
   --disable-avcodec        disable libavcodec build
   --disable-avformat       disable libavformat build
   --disable-swscale        disable libswscale build
-  --disable-postproc       disable libpostproc build
+  --enable-postproc        enable libpostproc build (deprecated) [no]
   --disable-avfilter       disable video filter support [no]
   --disable-pthreads       disable pthreads [auto]
   --disable-w32threads     disable Win32 threads [auto]
@@ -1680,7 +1680,6 @@ enable avdevice
 enable avfilter
 enable avformat
 enable avutil
-enable postproc
 enable swscale
 
 enable asm
diff --git a/doc/APIchanges b/doc/APIchanges
index 622e502da6..e94c656e9e 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -6,7 +6,7 @@ libavcodec:  2011-04-18
 libavdevice: 2011-04-18
 libavfilter: 2011-04-18
 libavformat: 2011-04-18
-libpostproc: 2011-04-18
+libpostproc: 2011-04-18 (deprecated, to be removed later)
 libswscale:  2011-06-20
 libavutil:   2011-04-18