diff --git a/gnome-online-accounts.changes b/gnome-online-accounts.changes
index fbe0382..9e633dd 100644
--- a/gnome-online-accounts.changes
+++ b/gnome-online-accounts.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri Feb  2 11:43:41 UTC 2018 - bjorn.lie@gmail.com
+
+- Don't enable Media Server option. It is an experimental untested
+  feature that was only used in GNOME Photos and the GNOME Photos
+  maintainer recommended we disable it, so stop passing
+  --enable-media-server to configure, pass --disable-media-server
+  instead.
+
 -------------------------------------------------------------------
 Thu Dec 14 20:26:33 UTC 2017 - zaitor@opensuse.org
 
diff --git a/gnome-online-accounts.spec b/gnome-online-accounts.spec
index d676249..d0764c5 100644
--- a/gnome-online-accounts.spec
+++ b/gnome-online-accounts.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package gnome-online-accounts
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -112,7 +112,7 @@ translation-update-upstream
         --enable-google \
         --enable-imap-smtp \
         --enable-kerberos \
-        --enable-media-server \
+        --disable-media-server \
         --enable-owncloud \
         --enable-pocket \
         --enable-telepathy \