diff -Nru account-plugins-0.11+14.04.20140325/data/webkit-options/secure.flickr.com.conf account-plugins-0.11+14.04.20140409.1/data/webkit-options/secure.flickr.com.conf
--- account-plugins-0.11+14.04.20140325/data/webkit-options/secure.flickr.com.conf	2014-03-25 13:38:13.000000000 +0000
+++ account-plugins-0.11+14.04.20140409.1/data/webkit-options/secure.flickr.com.conf	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-# Force mobile version, not to show google and facebook login options.
-# See also https://bugs.launchpad.net/bugs/1041744
-UserAgent = Mozilla/5.0 (iPhone; CPU iPhone OS 5_1_1 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Version/5.1 Mobile/9B206 Safari/7534.48.3
diff -Nru account-plugins-0.11+14.04.20140325/debian/account-plugin-flickr.install account-plugins-0.11+14.04.20140409.1/debian/account-plugin-flickr.install
--- account-plugins-0.11+14.04.20140325/debian/account-plugin-flickr.install	2014-04-10 09:21:13.000000000 +0000
+++ account-plugins-0.11+14.04.20140409.1/debian/account-plugin-flickr.install	2014-04-10 09:21:13.000000000 +0000
@@ -1,5 +1,4 @@
 etc/signon-ui/webkit-options.d/login.yahoo.com.conf
-etc/signon-ui/webkit-options.d/secure.flickr.com.conf
 usr/share/accounts/services/flickr-*.service
 usr/share/accounts/providers/flickr.provider
 usr/share/accounts/qml-plugins/flickr/Main.qml
diff -Nru account-plugins-0.11+14.04.20140325/debian/account-plugin-flickr.maintscript account-plugins-0.11+14.04.20140409.1/debian/account-plugin-flickr.maintscript
--- account-plugins-0.11+14.04.20140325/debian/account-plugin-flickr.maintscript	1970-01-01 00:00:00.000000000 +0000
+++ account-plugins-0.11+14.04.20140409.1/debian/account-plugin-flickr.maintscript	2014-04-10 09:21:13.000000000 +0000
@@ -0,0 +1 @@
+rm_conffile /etc/signon-ui/webkit-options.d/secure.flickr.com.conf 0.11+14.04.20140408
diff -Nru account-plugins-0.11+14.04.20140325/debian/changelog account-plugins-0.11+14.04.20140409.1/debian/changelog
--- account-plugins-0.11+14.04.20140325/debian/changelog	2014-04-10 09:21:13.000000000 +0000
+++ account-plugins-0.11+14.04.20140409.1/debian/changelog	2014-04-10 09:21:13.000000000 +0000
@@ -1,3 +1,33 @@
+account-plugins (0.11+14.04.20140409.1-0ubuntu1) trusty; urgency=low
+
+  [ Ubuntu daily release ]
+  * New rebuild forced
+
+  [ Alberto Mardegan ]
+  * Use new Canonical-owned facebook application key (LP: #1304798)
+
+  [ David Barth ]
+  * This change is to fix the maintainer scripts for the flickr
+    settings. It mostly undoes the changes of
+    https://code.launchpad.net/~mardy/account-
+    plugins/lp1299659/+merge/213415 which are considered dangerous. (LP:
+    #1299659)
+
+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com>  Wed, 09 Apr 2014 17:58:25 +0000
+
+account-plugins (0.11+14.04.20140401-0ubuntu1) trusty; urgency=low
+
+  [ Ubuntu daily release ]
+  * New rebuild forced
+
+  [ Alberto Mardegan ]
+  * Restore the ability to create flickr accounts. This has the
+    unfortunate side-effect of re-opening bug 1041744, by making the
+    unsupported "login with Facebook" and "login with Google" buttons
+    visible again, but that's a necessary evil. (LP: #1041744, #1299659)
+
+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com>  Tue, 01 Apr 2014 16:16:15 +0000
+
 account-plugins (0.11+14.04.20140325-0ubuntu1) trusty; urgency=low
 
   * 
diff -Nru account-plugins-0.11+14.04.20140325/debian/rules account-plugins-0.11+14.04.20140409.1/debian/rules
--- account-plugins-0.11+14.04.20140325/debian/rules	2014-04-10 09:21:13.000000000 +0000
+++ account-plugins-0.11+14.04.20140409.1/debian/rules	2014-04-10 09:21:13.000000000 +0000
@@ -12,6 +12,7 @@
 		--with-twitter-consumer-key="NGOB5S7sICsj6epjh0PhAw" \
 		--with-twitter-consumer-secret="rbUEJCBEokMnGZd8bubd0QL2cSmoCjJeyiSJpnx3OM0" \
 		--with-windows-live-client-id="00000000400D5635" \
+		--with-facebook-client-id="271112146382618" \
 		--with-foursquare-client-id="1I2UNJXPHNDZT3OPZOOA5LCPIUEUJFMKRXSF42UFCN1KXKTK" \
 		--with-google-client-id="759250720802-4sii0me9963n9fdqdmi7cepn6ub8luoh.apps.googleusercontent.com" \
 		--with-google-client-secret="juFngKUcuhB7IRQqHtSLavqJ" \
diff -Nru account-plugins-0.11+14.04.20140325/Makefile.am account-plugins-0.11+14.04.20140409.1/Makefile.am
--- account-plugins-0.11+14.04.20140325/Makefile.am	2014-03-25 13:38:13.000000000 +0000
+++ account-plugins-0.11+14.04.20140409.1/Makefile.am	2014-04-09 17:57:38.000000000 +0000
@@ -112,7 +112,6 @@
 	data/webkit-options/identi.ca.conf \
 	data/webkit-options/login.live.com.conf \
 	data/webkit-options/login.yahoo.com.conf \
-	data/webkit-options/secure.flickr.com.conf \
 	data/webkit-options/www.facebook.com.conf \
 	data/webkit-options/www.linkedin.com.conf