diff --git a/tumblr-photo-video-ripper.py b/tumblr-photo-video-ripper.py
index 7f97838..17e58f3 100644
--- a/tumblr-photo-video-ripper.py
+++ b/tumblr-photo-video-ripper.py
@@ -181,9 +181,12 @@ def download_photos(self, site):
 
     def _download_media(self, site, medium_type, start):
         current_folder = os.getcwd()
-        target_folder = os.path.join(current_folder, site)
-        if not os.path.isdir(target_folder):
-            os.mkdir(target_folder)
+        target_folder_base = os.path.join(current_folder, site)
+        if not os.path.isdir(target_folder_base):
+            os.mkdir(target_folder_base)
+        target_folder_other = os.path.join(current_folder, site+'-other')
+        if not os.path.isdir(target_folder_other):
+            os.mkdir(target_folder_other)
 
         base_url = "http://{0}.tumblr.com/api/read?type={1}&num={2}&start={3}"
         start = START
@@ -201,6 +204,13 @@ def _download_media(self, site, medium_type, start):
                 data = xmltodict.parse(xml_cleaned)
                 posts = data["tumblr"]["posts"]["post"]
                 for post in posts:
+                    if '@reblogged-from-url' in post:
+                        target_folder=target_folder_other
+                        if len (sys.argv) > 2 and sys.argv[2] == '-norepost':
+                            print ("Skipped\n")
+                            continue
+                    else:
+                        target_folder=target_folder_base
                     try:
                         # if post has photoset, walk into photoset for each photo
                         photoset = post["photoset"]["photo"]