diff --git a/NEWS b/NEWS
index 3eca73e..7a7cbf9 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,20 @@
-libva NEWS -- summary of user visible changes.  2017-06-28
+libva NEWS -- summary of user visible changes.  2017-10-21
 Copyright (C) 2009-2017 Intel Corporation
 
+Version 2.0.0 - 21.Oct.2017
+* Bump VA-API version to 1.0.0 and libva to 2.0.0
+* Add new API for H264 FEI support
+* Add definition of VA_FOURCC_I420
+* Add functions for converting common enums to strings
+* Deprecate H.264 baseline profile and FMO support
+* Deprecate packed misc packed header flag
+* Delete libva-tpi and libva-egl backends
+* Refine VASliceParameterBufferHEVC, VAEncMiscParameterBuffer
+* Fix errors in VAConfigAttribValEncROI, VAEncMacroblockParameterBufferH264
+* Fix race condition in wayland support
+* Rename vaMessageCallback to VAMessageCallback
+* Make logging callbacks library-safe
+
 Version 1.8.3 - 28.Jun.2017
 * Bump libva to 1.8.3
 * Fix build issue on Android
diff --git a/va/Android.mk b/va/Android.mk
index 0f872c3..22f80c8 100644
--- a/va/Android.mk
+++ b/va/Android.mk
@@ -36,7 +36,8 @@
 LOCAL_SRC_FILES := \
 	va.c \
 	va_trace.c \
-	va_fool.c
+	va_fool.c  \
+	va_str.c
 
 LOCAL_CFLAGS_32 += \
 	-DVA_DRIVERS_PATH="\"$(LIBVA_DRIVERS_PATH_32)\"" \
diff --git a/va/android/va_android.cpp b/va/android/va_android.cpp
index ab54684..ae96236 100644
--- a/va/android/va_android.cpp
+++ b/va/android/va_android.cpp
@@ -206,7 +206,7 @@
 {
     VADriverContextP ctx;
 
-    if (fool_postp)
+    if (va_fool_postp)
         return VA_STATUS_SUCCESS;
 
     if (draw == NULL)
diff --git a/va/va_internal.h b/va/va_internal.h
index c666159..7b8da55 100644
--- a/va/va_internal.h
+++ b/va/va_internal.h
@@ -25,6 +25,10 @@
 #ifndef VA_INTERNAL_H
 #define VA_INTERNAL_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define CTX(dpy) (((VADisplayContextP)dpy)->pDriverContext)
 #define CHECK_DISPLAY(dpy) if( !vaDisplayIsValid(dpy) ) { return VA_STATUS_ERROR_INVALID_DISPLAY; }
 
@@ -35,4 +39,8 @@
 
 VADisplayContextP va_newDisplayContext(void);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* VA_INTERNAL_H */