diff --git a/enable_decoders b/enable_decoders
index e557af7..b5664e0 100644
--- a/enable_decoders
+++ b/enable_decoders
@@ -13,6 +13,8 @@ flac # libFLAC
 gif # libpng
 gsm # libgsm
 huffyuv # trivial+zlib
+libaom # AV1
+libaom_av1 # AV1
 libcelt
 libgsm
 libopenjpeg
diff --git a/enable_encoders b/enable_encoders
index 95e177b..a1684a1 100644
--- a/enable_encoders
+++ b/enable_encoders
@@ -8,6 +8,8 @@ flac # libFLAC
 gif # libpng
 huffyuv # trivial+zlib
 jpegls
+libaom # AV1
+libaom_av1 # AV1
 libgsm
 libmp3lame
 libopenjpeg
diff --git a/ffmpeg-4.changes b/ffmpeg-4.changes
index e279f79..a2212c7 100644
--- a/ffmpeg-4.changes
+++ b/ffmpeg-4.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Sun Aug  5 12:56:17 UTC 2018 - bjorn.lie@gmail.com
+
+- Add conditional pkgconfig(aom) BuildRequires and pass
+  --enable-libaom to configure as well as add libaom and libaom_av1
+  to enable_decoders and enable_encoders: Build AOMedia Video 1
+  (AV1) support.
+
 -------------------------------------------------------------------
 Tue Jul 31 14:39:25 UTC 2018 - tchvatal@suse.com
 
diff --git a/ffmpeg-4.spec b/ffmpeg-4.spec
index f458c1e..1898fb6 100644
--- a/ffmpeg-4.spec
+++ b/ffmpeg-4.spec
@@ -63,6 +63,7 @@
 %endif
 
 %if 0%{?suse_version} > 1500
+%bcond_without libaom
 %bcond_without mysofa
 %bcond_without vidstab
 %bcond_without srt
@@ -73,6 +74,7 @@
 %bcond_without soxr
 %bcond_without zmq
 %else
+%bcond_with libaom
 %bcond_with mysofa
 %bcond_with vidstab
 %bcond_with srt
@@ -125,6 +127,9 @@ BuildRequires:  libmysofa-devel
 BuildRequires:  nasm
 BuildRequires:  pkg-config
 BuildRequires:  pkgconfig(alsa)
+%if %{with libaom}
+BuildRequires:  pkgconfig(aom)
+%endif
 BuildRequires:  pkgconfig(bzip2)
 BuildRequires:  pkgconfig(celt) >= 0.11.0
 %if %{with codec2}
@@ -580,6 +585,9 @@ CFLAGS="%optflags" \
 %if ! %{with nvidia}
 	--disable-cuda \
 	--disable-cuvid \
+%endif
+%if %{with libaom}
+	--enable-libaom \
 %endif
 	--enable-libass \
 	--enable-libbluray \