diff --git a/assets/checksums.txt b/assets/checksums.txt
index 1c9429c7d..634db3acd 100644
--- a/assets/checksums.txt
+++ b/assets/checksums.txt
@@ -1,5 +1,5 @@
 665b304cc08b6473d568f39503b289ee assets/ublock/filters.txt
-7b0b12c2c747a1aeb445d5746b8b206c assets/ublock/filter-lists.json
+a0d95cc038361353f6e108ac024ade72 assets/ublock/filter-lists.json
 36d8978c647291a4415dc02fe176e54e assets/thirdparties/download.wiltteri.net/wiltteri.txt
 132b3ecc9da8a68c3faf740c00af734b assets/thirdparties/adblock-plus-japanese-filter.googlecode.com/hg/abp_jp.txt
 3739b55487ff20f235c736601319f843 assets/thirdparties/adblock.gardar.net/is.abp.txt
@@ -28,6 +28,7 @@ f6bba27911e9b379bcb638e42f0bb740 assets/thirdparties/publicsuffix.org/list/effec
 7c0d09fbccd87b5252d3bab3e822f2e4 assets/thirdparties/adblock-czechoslovaklist.googlecode.com/svn/filters.txt
 a1b2beefe31c1f7e1304ae8409334b07 assets/thirdparties/liste-ar-adblock.googlecode.com/hg/Liste_AR.txt
 a3e622e6c420429fa7b22eae4471cd1b assets/thirdparties/www.fanboy.co.nz/enhancedstats.txt
+ea29b2802faf1c9011d60ae117b4a954 assets/thirdparties/www.fanboy.co.nz/fanboy-antifacebook.txt
 042419405031f0fcfac3735bf4f05e21 assets/thirdparties/www.malwaredomainlist.com/hostslist/README.md
 fd240a2efa8e30c87691663c87f685e4 assets/thirdparties/www.malwaredomainlist.com/hostslist/hosts.txt
 fbb638ed6eb138fa9a8b0190edcde2ab assets/thirdparties/indonesianadblockrules.googlecode.com/hg/subscriptions/abpindo.txt
diff --git a/assets/thirdparties/www.fanboy.co.nz/fanboy-antifacebook.txt b/assets/thirdparties/www.fanboy.co.nz/fanboy-antifacebook.txt
new file mode 100644
index 000000000..8821340cc
--- /dev/null
+++ b/assets/thirdparties/www.fanboy.co.nz/fanboy-antifacebook.txt
@@ -0,0 +1,60 @@
+[Adblock Plus 2.0]
+! Checksum: EVmuGzt+haGakxaO2RLpog
+! Title: Anti-Facebook
+! Expires: 4 days (update frequency)
+! Homepage: http://www.fanboy.co.nz
+!
+! Warning, will break on facebook-based comment sites and may also break on some facebook apps or games.
+!
+! Thirdparty Filters
+!
+||api-read.facebook.com/restserver.php?api_key=$third-party
+||api.facebook.com^$third-party
+||badge.facebook.com^$third-party
+||connect.facebook.net^$third-party,domain=~facebook.com
+||facebook.com/connect/$third-party
+||facebook.com/dialog/oauth?display=popup$popup,domain=humorhub.org
+||facebook.com/plugins/activity.php?$third-party
+||facebook.com/plugins/facepile.php?$third-party
+||facebook.com/plugins/fan.php?$third-party
+||facebook.com/plugins/follow.php$third-party
+||facebook.com/plugins/like.php?$third-party
+||facebook.com/plugins/like_box.php$third-party
+||facebook.com/plugins/likebox.php?$third-party
+||facebook.com/plugins/recommendations.php?$third-party
+||facebook.com/plugins/recommendations_bar.php?$third-party
+||facebook.com/plugins/send.php?$third-party
+||facebook.com/plugins/share_button.php?$third-party
+||facebook.com/plugins/subscribe.php$third-party
+||facebook.com/plugins/subscribe?$third-party
+||facebook.com/restserver.php?*.getStats&$third-party
+||facebook.com/whitepages/wpminiprofile.php$third-party
+||facebook.com/widgets/activity.php?$third-party
+||facebook.com/widgets/fan.php?$third-party
+||facebook.com/widgets/like.php?$third-party
+||facebook.com/widgets/recommendations.php?$third-party
+||graph.facebook.com/fql$third-party,domain=~deskhopapp.com
+!
+! Whitelist Filters
+!
+@@||akamaihd.net/rsrc.php/$domain=facebook.com
+@@||channel.facebook.com^$domain=facebook.com
+@@||facebook.com/ajax/browse/$domain=facebook.com
+@@||facebook.com/ajax/bz$domain=facebook.com
+@@||facebook.com/ajax/chat/buddy_list.php$domain=facebook.com
+@@||facebook.com/ajax/chat/hovercard/$domain=facebook.com
+@@||facebook.com/ajax/hovercard/$domain=facebook.com
+@@||facebook.com/ajax/litestand/$domain=facebook.com
+@@||facebook.com/ajax/notifications/$domain=facebook.com
+@@||facebook.com/ajax/pagelet/$domain=facebook.com
+@@||facebook.com/ajax/photos/$domain=facebook.com
+@@||facebook.com/ajax/presence/$domain=facebook.com
+@@||facebook.com/ajax/typeahead/$domain=facebook.com
+@@||facebook.com/ajax/webstorage/$domain=facebook.com
+@@||facebook.com/chat/$domain=facebook.com
+@@||facebook.com/images/$domain=facebook.com
+@@||fbcdn-photos-*.akamaihd.net^$domain=facebook.com
+@@||fbcdn-profile-*.akamaihd.net^$domain=facebook.com
+@@||fbcdn-sphotos-*.akamaihd.net^$domain=facebook.com
+@@||fbexternal-*.akamaihd.net^$domain=facebook.com
+@@||scontent-*.fbcdn.net^$domain=facebook.com
diff --git a/assets/ublock/filter-lists.json b/assets/ublock/filter-lists.json
index 7b4bd4113..09f883dd5 100644
--- a/assets/ublock/filter-lists.json
+++ b/assets/ublock/filter-lists.json
@@ -45,6 +45,10 @@
         "off": true,
         "title": "Fanboy’s Enhanced Tracking List"
         },
+    "www.fanboy.co.nz/fanboy-antifacebook.txt": {
+        "off": true,
+        "title": "Fanboy’s Anti-Facebook (see warning inside list)"
+        },
     "easylist-downloads.adblockplus.org/easylistgermany.txt": {
         "off": true,
         "title": "EasyList Germany"