diff --git a/gallery_dl/extractor/imagehosts.py b/gallery_dl/extractor/imagehosts.py
index 78032721..05e75405 100644
--- a/gallery_dl/extractor/imagehosts.py
+++ b/gallery_dl/extractor/imagehosts.py
@@ -379,7 +379,9 @@ class FappicImageExtractor(ImagehostImageExtractor):
         url     , pos = text.extract(page, '<a href="#"><img src="', '"')
         filename, pos = text.extract(page, 'alt="', '"', pos)
 
-        if filename.startswith("Porn-Picture-"):
+        if filename.startswith("Porn Pics "):
+            filename = filename[10:]
+        elif filename.startswith("Porn-Picture-"):
             filename = filename[13:]
 
         return url, filename
diff --git a/test/results/fappic.py b/test/results/fappic.py
index b89c4e29..bcb86542 100644
--- a/test/results/fappic.py
+++ b/test/results/fappic.py
@@ -15,12 +15,16 @@ __tests__ = (
 },
 
 {
-    "#url"     : "https://www.fappic.com/98wxqcklyh8k/test.png",
+    "#url"     : "https://www.fappic.com/98wxqcklyh8k/foo.bar",
     "#category": ("imagehost", "fappic", "image"),
     "#class"   : imagehosts.FappicImageExtractor,
     "#pattern"      : r"https://img\d+\.fappic\.com/img/\w+/test\.png",
     "#sha1_metadata": "433b1d310b0ff12ad8a71ac7b9d8ba3f8cd1e898",
     "#sha1_content" : "0c8768055e4e20e7c7259608b67799171b691140",
+
+    "filename"   : "test",
+    "extension"  : "png",
+    "token"      : "98wxqcklyh8k",
 },
 
 )