diff --git a/baselibs.conf b/baselibs.conf
index e694ee2..eeba16d 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -2,6 +2,8 @@ libdrm2
 libdrm_freedreno1
 libdrm_intel1
 libdrm_nouveau2
+libdrm_etnaviv1
+libdrm_exynos1
 libdrm_omap1
 libdrm_radeon1
 libdrm_amdgpu1
diff --git a/libdrm.changes b/libdrm.changes
index 046a74c..ad58162 100644
--- a/libdrm.changes
+++ b/libdrm.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Dec 19 08:47:22 UTC 2018 - Guillaume GARDET <guillaume.gardet@opensuse.org>
+
+- Fix --enable-freedreno option as it is not experimental anymore
+- Add etnaviv support
+- Add exynos support (used by Arndale board and Samsung Chromebook)
+
 -------------------------------------------------------------------
 Wed Oct 17 14:29:54 UTC 2018 - sndirsch@suse.com
 
diff --git a/libdrm.spec b/libdrm.spec
index 17032fc..60233b0 100644
--- a/libdrm.spec
+++ b/libdrm.spec
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -71,6 +71,8 @@ Requires:       libdrm_radeon1 = %{version}
 Requires:       libdrm_freedreno1 = %{version}
 %endif
 %ifarch %{arm}
+Requires:       libdrm_etnaviv1 = %{version}
+Requires:       libdrm_exynos1 = %{version}
 Requires:       libdrm_omap1 = %{version}
 Requires:       libdrm_tegra0 = %{version}
 %endif
@@ -157,6 +159,20 @@ Group:          System/Libraries
 %description -n libdrm_omap1
 (Upstream has not provided a description)
 
+%package -n libdrm_etnaviv1
+Summary:        Userspace interface to kernel DRM services for Vivante chips
+Group:          System/Libraries
+
+%description -n libdrm_etnaviv1
+(Upstream has not provided a description)
+
+%package -n libdrm_exynos1
+Summary:        Userspace interface to kernel DRM services for Samsung Exynos chips
+Group:          System/Libraries
+
+%description -n libdrm_exynos1
+(Upstream has not provided a description)
+
 %package -n libdrm_freedreno1
 Summary:        Userspace interface to kernel DRM services for Qualcomm Adreno chips
 Group:          System/Libraries
@@ -186,7 +202,9 @@ export CFLAGS="%{optflags} -fno-strict-aliasing"
 %endif
 %ifarch %{arm}
 	   --enable-omap-experimental-api \
-	   --enable-freedreno-experimental-api \
+	   --enable-etnaviv-experimental-api \
+	   --enable-exynos-experimental-api \
+	   --enable-freedreno \
            --enable-tegra-experimental-api \
 %endif
 	   --enable-manpages \
@@ -207,6 +225,9 @@ mkdir -p %{buildroot}%{_prefix}/bin
 install  \
     tests/modeprint/.libs/modeprint \
     tests/modetest/.libs/modetest %{buildroot}%{_prefix}/bin
+%ifarch %arm
+install tests/exynos/.libs/exynos_fimg2d_test  %{buildroot}%{_prefix}/bin
+%endif
 
 %post   -n libdrm2 -p /sbin/ldconfig
 %postun -n libdrm2 -p /sbin/ldconfig
@@ -222,6 +243,10 @@ install  \
 %postun -n libkms1 -p /sbin/ldconfig
 
 %ifarch %{arm}
+%post   -n libdrm_etnaviv1 -p /sbin/ldconfig
+%postun -n libdrm_etnaviv1 -p /sbin/ldconfig
+%post   -n libdrm_exynos1 -p /sbin/ldconfig
+%postun -n libdrm_exynos1 -p /sbin/ldconfig
 %post   -n libdrm_omap1 -p /sbin/ldconfig
 %postun -n libdrm_omap1 -p /sbin/ldconfig
 %post   -n libdrm_tegra0 -p /sbin/ldconfig
@@ -234,6 +259,9 @@ install  \
 %endif
 
 %files tools
+%ifarch %arm
+%{_bindir}/exynos_fimg2d_test
+%endif
 %{_bindir}/modeprint
 %{_bindir}/modetest
 
@@ -244,6 +272,7 @@ install  \
 %{_mandir}/man7/*
 %{_includedir}/libdrm
 %ifarch %{arm}
+%{_includedir}/exynos
 %{_includedir}/omap
 %endif
 %ifarch %{arm} aarch64
@@ -283,6 +312,12 @@ install  \
 %{_libdir}/pkgconfig/libkms.pc
 
 %ifarch %{arm}
+%files -n libdrm_etnaviv1
+%_libdir/libdrm_etnaviv.so.1*
+
+%files -n libdrm_exynos1
+%_libdir/libdrm_exynos.so.1*
+
 %files -n libdrm_omap1
 %{_libdir}/libdrm_omap.so.1*